aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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-2317-112/+165
|\
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-235-30/+32
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-2212-82/+131
| * Fix tests on 1.9Jeremy Kemper2009-04-221-0/+2
* | Merge commit 'mainstream/master'Pratik Naik2009-04-2324-362/+571
|\|
| * 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
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-224-16/+80
| |\
| | * Fix test_rescue_routing_exceptions when running with rakeJoshua Peek2009-04-211-13/+15
| | * refactor some coupled rescue testsJoshua Peek2009-04-211-16/+78
| | * Session tests belong under dispatch folderJoshua Peek2009-04-213-0/+0
| * | 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-213-6/+38
| * Remove excess mocking from polymorphic_url tests [#2330 state:resolved]Mike Gunderloy2009-04-212-293/+394
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-204-22/+13
| |\
| | * Always buffer rack.input if it is not rewindableMislav Marohnić2009-04-174-18/+11
| | * Improve rewindable input test coverage so tests fail when you remove the midd...Mislav Marohnić2009-04-172-4/+2
| * | render_for_text pushes a body part instead of replacing the whole bodyJeremy Kemper2009-04-172-10/+12
| * | Don't set Content-Length in Base#response_body= since body may be any Rack-co...Jeremy Kemper2009-04-171-1/+0
| * | Rename render_to_string to render_to_body since it may return any Rack-compat...Jeremy Kemper2009-04-176-14/+14
| |/
| * Merge docrailslifo2009-04-174-6/+6
* | Replaced TimeZone references by ActiveSupport::TimeZoneJosé Valim2009-04-181-21/+21
* | Merge commit 'mainstream/master'lifo2009-04-17237-2229/+4220
|\|
| * Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-161-8/+8
| * Don't check authenticity tokens for any AJAX requestsRoss Kaffenburger and Bryan Helmkamp2009-04-153-6/+10
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-1410-118/+124
| * Move middleware stack out of utils folderJoshua Peek2009-04-141-1/+1
| * Make dispatcher instances immutableJoshua Peek2009-04-141-3/+14
| * Final blow to CGIJoshua Peek2009-04-141-14/+3
| * We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-141-1/+1
| * Move all Templates methods not used by other class into private toCarl Lerche & Yehuda Katz2009-04-141-87/+88
| * Move MimeResponds into base folderJoshua Peek2009-04-142-1/+1
| * Move reloader middleware in ActionDispatchJoshua Peek2009-04-144-6/+6
| * Session management belongs in base folderJoshua Peek2009-04-142-1/+1
| * Move middleware stack out of utils folderJoshua Peek2009-04-142-2/+1
| * Backwords compat alias for ActionController::Request and ActionController::Re...Joshua Peek2009-04-142-0/+3
| * Use rack's status code list as a baseJoshua Peek2009-04-141-67/+19
| * Make dispatcher instances immutableJoshua Peek2009-04-142-14/+10
| * Final blow to CGIJoshua Peek2009-04-146-268/+2
| * We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-144-51/+28
| * Move bundled rack into ActionDispatchJoshua Peek2009-04-1453-13/+7
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-134-7/+10
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-13172-3607/+10033
| |\
| | * Fix for TestResponse.cookies returning cookies unescaped [#1867 state:resolved]Doug McInnes2009-04-073-1/+16