aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use public submodule urlJeremy Kemper2009-04-301-1/+1
* Make ruby-debug optionalJeremy Kemper2009-04-301-2/+5
* exists? method now uses ARelEmilio Tagua2009-04-301-10/+5
* Added arel_attributes_values methods, refactored locking and AR#update to use...Emilio Tagua2009-04-303-22/+29
* Merge commit 'rails/master'Emilio Tagua2009-04-307-20/+21
|\
| * Work around Float faux precisionJeremy Kemper2009-04-303-15/+15
| * Convert params keys to stringsJeremy Kemper2009-04-291-0/+1
| * Prefer behavior check to RUBY_VERSION to catch 1.8 backportsJeremy Kemper2009-04-293-5/+5
* | Merge commit 'rails/master'Emilio Tagua2009-04-29155-6327/+1775
|\|
| * Fix duplicated test nameEmilio Tagua2009-04-291-1/+1
| * Additional tests for the gem subsystemDavid Dollar2009-04-295-0/+101
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2817-158/+210
| |\
| | * Deprecate template, session, assigns, and layout accessors on response object...Joshua Peek2009-04-2815-142/+195
| | * Deprecate response.assignsJoshua Peek2009-04-281-2/+6
| | * Move header injection back into integration testsJoshua Peek2009-04-282-12/+7
| | * Fix validate_request method nameJoshua Peek2009-04-281-4/+4
| * | Attempt to deal with more cases of gems with native components.David Dollar2009-04-289-6/+159
| |/
| * Rejig active support dependencies to behave better with the boot processJeremy Kemper2009-04-285-8/+12
| * Fix missing core extension dependenciesJeremy Kemper2009-04-286-2/+10
| * Show executed queries when assert_sql assertion fails [#2573 state:resolved]Emilio Tagua2009-04-281-1/+1
| * Fixes ActionMailer to work with the ActionView refactoringYehuda Katz + Carl Lerche2009-04-273-158/+9
| * Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-2723-284/+343
| * Ensure the parent record is always saved when the child is invalid. [#2249 st...Eloy Duran2009-04-272-5/+31
| * Delegate controller.session to request.session and deprecate response session Joshua Peek2009-04-275-25/+11
| * Can't please them allJeremy Kemper2009-04-271-2/+1
| * Sufficient to test that multipart/mixed wasn't parsed to a hashJeremy Kemper2009-04-271-1/+1
| * Don't return bare string as rack bodyJeremy Kemper2009-04-272-3/+3
| * Make it clearer that session is nilJeremy Kemper2009-04-261-0/+1
| * Fix differing rails_to_json arityJeremy Kemper2009-04-262-6/+11
| * Use Array.wrapJeremy Kemper2009-04-261-4/+4
| * Use __send__ for BasicObject friendlinessJeremy Kemper2009-04-261-1/+1
| * Now that we have a separate internal rails_to_json, use a separate circular r...Jeremy Kemper2009-04-2617-28/+29
| * Use javascript_object_forJeremy Kemper2009-04-261-1/+1
| * Check for to_str rather than StringJeremy Kemper2009-04-261-1/+1
| * Array splitting strings on newlines is deprecatedJeremy Kemper2009-04-261-4/+15
| * Not sure why Request#session is missingJeremy Kemper2009-04-261-0/+8
| * Use session= writer methodsJeremy Kemper2009-04-261-2/+2
| * Convert encoding before escapingJeremy Kemper2009-04-261-5/+6
| * add JRuby-JDOM backend for XmlMiniStephen Bannasch2009-04-262-0/+315
| * Don't assume :params is a HashJeremy Kemper2009-04-261-4/+1
| * Check for to_str rather than StringJeremy Kemper2009-04-261-3/+1
| * Don't undefine object_idJeremy Kemper2009-04-261-1/+1
| * Privatize rails_to_jsonJeremy Kemper2009-04-2616-157/+171
| * Extract json string escapingJeremy Kemper2009-04-262-38/+33
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2676-5614/+499
| |\
| | * Inherit TestSession from Session::AbstractStore and add indifferent access to...Joshua Peek2009-04-2610-125/+67
| | * Require an ActionDispatch::Request to use response assertionsJoshua Peek2009-04-261-6/+18
| | * Unify functional and integration tests cookie helpersJoshua Peek2009-04-262-22/+13
| | * Fix environment variable testing code in failsafe.rb.Hongli Lai (Phusion)2009-04-261-1/+1
| | * Remove reference to Rack::RewindableInput, which has been removed a while ago.Hongli Lai (Phusion)2009-04-261-1/+1