aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-1820-22/+104
|\
| * 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
| * | Include acts_as_string?Jeremy Kemper2009-05-181-0/+1
| * | Add ability to get multiple memcached keys at the same time (via MemCacheStor...Joe Van Dyk2009-05-183-0/+14
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-187-4/+45
| |\|
| | * Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 state:r...Luca Guidi2009-05-182-2/+15
| | * Make sure default_scope#create checks for options[:conditions] [#2181 state:r...Pratik Naik2009-05-183-1/+21
| | * Truncate helper accepts a :separator for a more legible result [#1807 state:r...Andy Stewart2009-05-182-1/+9
| * | Reimplement Fixtures.identify so that it consistently generates identities ac...Ken Collins2009-05-182-4/+10
| * | 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
| * | 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
| * | 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
* | | Merge commit 'rails/master'Emilio Tagua2009-05-18175-979/+1996
|\| |
| * | Fixed limited eager loading associations with numbers in the name [#2668 stat...Benjamin Floering2009-05-185-2/+11
| * | Report errors in 'all project' rake tasks [#2224 state:resolved]Kerry Buckley2009-05-181-1/+3
| * | load the JSON Backend lazily. If the JSON gem is already loaded, use the JSO...rick2009-05-174-5/+17
| * | Allow ParamsParser to parse YAML from the request body IO directlyBrian Lopez2009-05-171-1/+1
| * | 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
| * | Extract generic callbacks middleware from dispatcherJoshua Peek2009-05-177-79/+103
| * | Add tests for assert_template :templateMike Breen2009-05-171-0/+23
| * | 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 state:re...Travis Briggs2009-05-172-1/+10
| * | Simplify filter_chain method implementation [#2327 state:resolved]Thomas E. Glasgow2009-05-171-6/+1
| * | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ...Chris Kampmeier2009-05-175-1/+94
| * | Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:...Lance Ivy2009-05-172-6/+14
| * | Add support for parsing XML and JSON from an IO as well as a string [#2659 st...Brian Lopez2009-05-179-30/+77
| * | Remove obsolete wiki reference [#2291 state:resolved]Mike Gunderloy2009-05-171-1/+1
| * | Fix typo in the generated routes.rb [#2433 state:resolved]Paulo Schneider2009-05-171-1/+1
| * | Supply valid ruby-prof parameters [#1804 state:resolved]Jacob Kjeldahl2009-05-171-1/+1
| * | has_one :through should not create a new association when assigned nil [#698 ...Daniel Guettler2009-05-172-9/+16
| * | 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
| * | Get Railties passing againYehuda Katz2009-05-168-17/+23
| * | Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| * | Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| * | ChangelogBryan Helmkamp2009-05-161-0/+2
| * | Instead of checking Rails.env.test? in Failsafe middleware, check env["rails....Bryan Helmkamp2009-05-163-8/+9
| * | Include guides directory in the rails gemPratik Naik2009-05-161-3/+4
| * | Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-159-27/+111
| * | Refactored AbstractController to provide better hook points for overriding as...Yehuda Katz + Carl Lerche2009-05-155-33/+39
| * | Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| * | Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-1411-16/+65
| |\|
| | * Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 21:16:58 +0000