aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those.
| * ChangelogBryan Helmkamp2009-05-161-0/+2
| |
| * Instead of checking Rails.env.test? in Failsafe middleware, check ↵Bryan Helmkamp2009-05-163-8/+9
| | | | | | | | env["rails.raise_exceptions"]
| * 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 ↵Yehuda Katz + Carl Lerche2009-05-155-33/+39
| | | | | | | | aspects of action dispatching
| * Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-1411-16/+65
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| | * Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
| | |
| | * Cherry-picking Active Support extensionsJeremy Kemper2009-05-142-2/+5
| | |
| | * Simple example for require profilingJeremy Kemper2009-05-141-0/+17
| | |
| | * Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵Peter Marklund2009-05-142-8/+9
| | | | | | | | | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed]
| * | Got new base to pass controller/base_test.rb, implemented method_missing ↵Yehuda Katz + Carl Lerche2009-05-148-11/+61
| | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs.
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-1411-33/+122
| |/
| * Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-138-321/+585
| |
| * Simple examples for require profilingJeremy Kemper2009-05-133-2/+32
| |
| * Cherry-pick core extensionsJeremy Kemper2009-05-1371-83/+168
| |
| * isolated_test taskJeremy Kemper2009-05-132-6/+20
| |
| * Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-133-53/+8
| |
| * Preserve orderingJeremy Kemper2009-05-131-2/+8
| |
| * Defer rake/contrib requires so we can use the stdlib rake instead of the ↵Jeremy Kemper2009-05-132-2/+4
| | | | | | | | full gem
| * Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1220-102/+251
| |
| * Fixed new callbacks to not call the action when a callback sets the response ↵Yehuda Katz + Carl Lerche2009-05-122-1/+20
| | | | | | | | body
* | Merge commit 'rails/master'Emilio Tagua2009-05-1299-654/+1819
|\|
| * Defer rake/contrib/sshpublisher require so we can use the stdlib rake ↵Jeremy Kemper2009-05-111-1/+2
| | | | | | | | instead of the full gem
| * Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1121-125/+111
| |