aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-1921-45/+103
|\
| * Replace ad hoc Rack::Test with ActionController::IntegrationTestPratik Naik2009-05-202-10/+8
| |
| * Missing CHANGELOG entry for 4a6f4b92ad2fPratik Naik2009-05-191-0/+5
| |
| * Change integration test helpers to accept Rack environment instead of just ↵Pratik Naik2009-05-192-18/+16
| | | | | | | | | | | | | | HTTP Headers. Before : get '/path', {}, 'Accept' => 'text/javascript' After : get '/path', {}, 'HTTP_ACCEPT' => 'text/javascript'
| * Lazy-require Kernel#silence_warningsJeremy Kemper2009-05-191-2/+1
| |
| * Allow MemCacheStore to be initialized with a MemCache object instead of ↵Bryan Helmkamp2009-05-193-10/+23
| | | | | | | | addresses and options
| * Upgrade CI server to latest RubyGems [#2665 state:resolved]Chad Woolley2009-05-193-2/+4
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Add missing models and fixtures [#2673 state:resolved]Emilio Tagua2009-05-193-25/+32
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ported simple benchmarking in new baseYehuda Katz + Carl Lerche2009-05-187-3/+39
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-1820-22/+104
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\
| | * Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Include acts_as_string?Jeremy Kemper2009-05-181-0/+1
| | |
| * | Add ability to get multiple memcached keys at the same time (via ↵Joe Van Dyk2009-05-183-0/+14
| | | | | | | | | | | | | | | | | | MemCacheStore#read_multi). Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-187-4/+45
| |\|
| | * Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-182-2/+15
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-183-1/+21
| | | | | | | | | | | | state:resolved] [James Le Cuirot]
| | * Truncate helper accepts a :separator for a more legible result [#1807 ↵Andy Stewart2009-05-182-1/+9
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-182-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-182-0/+3
| | |
| * | Revert "Get AR CI passing again by requiring the entire core_ext"Jeremy Kemper2009-05-181-3/+0
| | | | | | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547.
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-18100-409/+871
| |\|
| | * Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] ↵Pratik Naik2009-05-182-4/+22
| | | | | | | | | | | | [Steve Madsen]
| * | Active Support dependenciesJeremy Kemper2009-05-142-0/+2
| | |
* | | Merge branch 'master' of git://github.com/rails/railsEmilio Tagua2009-05-181-2/+2
|\ \ \ | | |/ | |/|
| * | Add missing model and fixtures to finder_test [#2671 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Merge commit 'rails/master'Emilio Tagua2009-05-18175-979/+1996
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb
| * | Fixed limited eager loading associations with numbers in the name [#2668 ↵Benjamin Floering2009-05-185-2/+11
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Report errors in 'all project' rake tasks [#2224 state:resolved]Kerry Buckley2009-05-181-1/+3
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | load the JSON Backend lazily. If the JSON gem is already loaded, use the ↵rick2009-05-174-5/+17
| | | | | | | | | | | | JSONGem backend by default.
| * | Allow ParamsParser to parse YAML from the request body IO directlyBrian Lopez2009-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-172-4/+12
| | |
| * | replace the aaa_create_tables_test hack with loading test database schema in ↵Mislav Marohnić2009-05-174-31/+22
| | | | | | | | | | | | | | | | | | the test helper [#2663 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Extract generic callbacks middleware from dispatcherJoshua Peek2009-05-177-79/+103
| | |
| * | Add tests for assert_template :templateMike Breen2009-05-171-0/+23
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge Failsafe middleware into ShowExceptionsJoshua Peek2009-05-179-106/+65
| | |
| * | Rescue hack was supposed to be removed. Some how it crept back in.Joshua Peek2009-05-174-10/+2
| | |
| * | Ensure number_to_human_size does not strip zeros from the end [#1763 ↵Travis Briggs2009-05-172-1/+10
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Simplify filter_chain method implementation [#2327 state:resolved]Thomas E. Glasgow2009-05-171-6/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵Chris Kampmeier2009-05-175-1/+94
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵Lance Ivy2009-05-172-6/+14
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Add support for parsing XML and JSON from an IO as well as a string [#2659 ↵Brian Lopez2009-05-179-30/+77
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Remove obsolete wiki reference [#2291 state:resolved]Mike Gunderloy2009-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Fix typo in the generated routes.rb [#2433 state:resolved]Paulo Schneider2009-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Supply valid ruby-prof parameters [#1804 state:resolved]Jacob Kjeldahl2009-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | has_one :through should not create a new association when assigned nil [#698 ↵Daniel Guettler2009-05-172-9/+16
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Ensure rake test does not run new base tests as that requires rack/testPratik Naik2009-05-171-1/+1
| | |
| * | Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]Jeffrey Chupp2009-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Get Railties passing againYehuda Katz2009-05-168-17/+23
| | |
| * | Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 19:48:33 +0000