aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-0129-102/+134
|\
| * Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...José Valim2011-11-302-1/+10
| * removes a Serialization constant left in the previous revertXavier Noria2011-11-251-1/+0
| * Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-251-51/+0
| * Add docs to serializers. Update CHANGELOGs.José Valim2011-11-251-0/+23
| * Rely solely on active_model_serializer and remove the fancy constant lookup.José Valim2011-11-231-1/+3
| * Merge branch 'master' into serializersJosé Valim2011-11-2311-37/+35
| |\
| | * Rely on a public contract between railties instead of accessing railtie metho...José Valim2011-11-231-3/+4
| | * move show_detailed_exceptions? to Rescue modulelest2011-11-223-5/+12
| | * add ActionController::Metal#show_detailed_exceptions?lest2011-11-221-0/+5
| | * Merge pull request #3613 from mitio/fix-actionpack-responder-docsXavier Noria2011-11-111-4/+4
| | |\
| | | * Fix wording and minor typos in the Responder RDocDimitar Dimitrov2011-11-111-4/+4
| | * | Merge pull request #3581 from amatsuda/metal_response_body_19José Valim2011-11-101-1/+7
| | |\ \
| | | * | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9Akira Matsuda2011-11-071-1/+7
| | * | | DrbStore removed from cache backendsIvan Evtukhovich2011-11-071-1/+0
| | * | | fix incorrect code exampleVijay Dev2011-11-071-1/+1
| | |/ /
| | * | this should never return nil, so no use for "try"Aaron Patterson2011-10-311-1/+1
| | * | Ensure that the format isn't applied twice to the cache key, else it becomes ...Christopher Meiklejohn2011-10-311-1/+1
| | * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-301-2/+2
| | |\ \
| | | * | add namespacing when referring to ActionController::RedirectBackErrorNick Howard2011-10-251-2/+2
| | * | | Responders now return 204 No Content for API requests without a response body...José Valim2011-10-261-21/+1
| | |/ /
| | * | HTMl -> HTML: html scanner comment fixAlexey Vakhov2011-10-151-1/+1
| | * | Update AC::RecordIdentifier exampleAlexey Vakhov2011-10-151-2/+2
| | |/
| * | Refactor to make renderers a SetJose and Yehuda2011-10-151-11/+9
| * | Initial commit of serializer supportJose and Yehuda2011-10-152-0/+27
| |/
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-142-2/+4
| |\
| | * status is a number in Rails 3Akira Matsuda2011-10-121-2/+2
| | * Add ActionController#head exampleAlexey Vakhov2011-10-111-0/+2
| * | Support symbol and string actions in AC#respond_to optionsAlexey Vakhov2011-10-111-3/+3
| |/
| * JSON responder should return errors with :error rootDenis Odorcic2011-10-101-1/+9
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-091-1/+1
| |\
| | * Fix params hash example in AC::Base commentAlexey Vakhov2011-10-081-1/+1
| * | accept optional :host parameter to force_sslBen Scheirman2011-10-081-2/+5
| * | Remove unnecessary dup in expire_pageAlexey Vakhov2011-10-081-1/+1
| |/
| * Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantizeJosé Valim2011-10-031-3/+1
| |\
| | * use safe_constantize instead constantize in AC::TestCaseAlexey Vakhov2011-10-031-3/+1
| * | normalize arg for AC::TestCase tests class methodAlexey Vakhov2011-10-031-2/+14
| |/
| * add missing require to html sanitizerAlexey Vakhov2011-09-271-0/+1
| * Use safe_constantize where possible.José Valim2011-09-231-6/+3
| * Change log level for CSRF token verification warningMike Dillon2011-09-101-1/+1
| * Nicolás Hock Isaza2011-09-061-1/+1
| * Eliminate newlines in basic auth. fixes #2882Aaron Patterson2011-09-061-1/+1
| * if ... nil? is more expensive than unlessMilan Dobrota2011-09-043-5/+5
| * fix helpers behavior descriptionAlexey Vakhov2011-09-031-3/+6
| * deletes spurious arrowXavier Noria2011-08-271-1/+1
| * doc fixesVijay Dev2011-08-281-8/+8
| * Make ActionController::TestCase#recycle! set @protocol to nilDavid Majda2011-08-231-1/+1
| * Don't modify params in place - fixes #2624Andrew White2011-08-231-5/+3
| * Merge pull request #2596 from dharmatech/patch-1Santiago Pastorino2011-08-201-1/+1
| |\
| | * ActionController::Redirecting : fix docs typodharmatech2011-08-201-1/+1