aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Some spelling changes.Evan Farrar2009-05-0710-16/+16
* bugfix for with_options routing documentationSimon Tokumine2009-05-011-1/+1
* Merge commit 'mainstream/master'Pratik Naik2009-04-3076-5633/+534
|\
| * Convert params keys to stringsJeremy Kemper2009-04-291-0/+1
| * Deprecate template, session, assigns, and layout accessors on response object...Joshua Peek2009-04-289-20/+36
| * 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
| * Fixes ActionMailer to work with the ActionView refactoringYehuda Katz + Carl Lerche2009-04-271-151/+1
| * Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-2711-202/+281
| * Delegate controller.session to request.session and deprecate response session Joshua Peek2009-04-274-19/+11
| * Don't return bare string as rack bodyJeremy Kemper2009-04-271-2/+2
| * Now that we have a separate internal rails_to_json, use a separate circular r...Jeremy Kemper2009-04-261-2/+2
| * 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
| * Don't assume :params is a HashJeremy Kemper2009-04-261-4/+1
| * Check for to_str rather than StringJeremy Kemper2009-04-261-3/+1
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2664-5385/+337
| |\
| | * Inherit TestSession from Session::AbstractStore and add indifferent access to...Joshua Peek2009-04-266-94/+46
| | * Require an ActionDispatch::Request to use response assertionsJoshua Peek2009-04-261-6/+18
| | * Unify functional and integration tests cookie helpersJoshua Peek2009-04-261-21/+12
| | * Fix environment variable testing code in failsafe.rb.Hongli Lai (Phusion)2009-04-261-1/+1
| | * Fix typo in stale session check [#2404 state:resolved]Joshua Peek2009-04-261-1/+1
| | * Deprecate response.redirect_url_match?, use assert_match instead.Joshua Peek2009-04-261-0/+1
| | * Move useful response test helpers into requestJoshua Peek2009-04-263-64/+69
| | * Remove RewindableInput middleware since all input MUST be rewindable accordin...Joshua Peek2009-04-253-21/+0
| | * Remove vendored version of RackJoshua Peek2009-04-2552-5006/+7
| | * Remove pending rack specifications until they are officialJoshua Peek2009-04-253-6/+4
| | * Start to integrate some of the features in Rack::Test.Joshua Peek2009-04-245-178/+191
| * | Only Object to_json alias is needed. Prefer nil options.Jeremy Kemper2009-04-261-2/+0
| * | Qualify toplevel constant references since we're in a BasicObjectJeremy Kemper2009-04-261-7/+7
| |/
* | Removed reference in documentation of form_authenticity_token to deprecated :...Luke Amdor2009-04-271-2/+1
* | fixes an example from the previous commitXavier Noria2009-04-271-2/+2
* | adds timestamps in examples of generated asset paths, and documents this bit ...Xavier Noria2009-04-271-69/+72
* | Add documentation for respond_to's any methodRyan Bigg2009-04-271-0/+12
* | Merge commit 'mainstream/master'Pratik Naik2009-04-2313-81/+138
|\|
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-233-13/+15
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-2210-68/+121
| * Fix tests on 1.9Jeremy Kemper2009-04-221-0/+2
* | Merge commit 'mainstream/master'Pratik Naik2009-04-2313-44/+70
|\|
| * Merge branch 'master' into cherryJeremy Kemper2009-04-221-0/+2
| |\
| | * Opt in to JSONJeremy Kemper2009-04-221-0/+2
| * | Opt in to DependenciesJeremy Kemper2009-04-221-0/+1
| |/
| * No more free lunchJeremy Kemper2009-04-223-0/+3
| * Rack::Utils.body_to_s doesn't exist in 1.0Jeremy Kemper2009-04-222-2/+16
| * Reinstate Base#render_to_string. Introduce AbstractController#render_to_strin...Jeremy Kemper2009-04-212-6/+20
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-201-17/+8
| |\