aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-097-18/+18
|\
| * Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
* | Copy shallow options from normal options when using scopeAndrew White2014-03-081-1/+2
* | Pull namespace defaults out of the options hashAndrew White2014-03-081-3/+10
* | Only use shallow nested scope when depth is > 1Andrew White2014-03-081-20/+23
* | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
* | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-081-1/+7
|\ \
| * | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-051-1/+7
| |/
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-1/+1
|\ \
| * | :scissors:Zachary Scott2014-02-231-1/+1
* | | Merge pull request #14285 from sikachu/master-revert-render-body-remove-conte...Aaron Patterson2014-03-063-17/+4
|\ \ \
| * | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-053-17/+4
| | |/ | |/|
* / | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
|/ /
* | Add spaces to deep_munge log message.Shuhei Kagawa2014-03-031-3/+3
* | Replace map.flatten(1) with flat_mapErik Michaels-Ober2014-02-282-5/+5
* | use built-in exception handling in live controllersAaron Patterson2014-02-281-2/+5
* | live controllers should have live responsesAaron Patterson2014-02-282-8/+36
* | set the error callback to a nice default in case nobody set an error callback...Aaron Patterson2014-02-281-1/+1
* | Fix controller test not resetting @_url_optionsTony Wooster2014-02-262-1/+1
* | `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.Yves Senn2014-02-251-1/+0
* | Simple Sungularize ActionController::UnpermittedParameters error in case when...Serj L2014-02-242-2/+2
* | update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
* | Check if the `request` variable isn't nil when calling render_to_stringJoan Karadimov2014-02-201-1/+3
|/
* Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-183-8/+8
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
* | Add `#no_content_type` attribute to `AD::Response`Prem Sichanugrist2014-02-183-10/+19
* | Cleanup `ActionController::Rendering`Prem Sichanugrist2014-02-181-11/+27
* | Introduce `render :html` for render HTML stringPrem Sichanugrist2014-02-181-2/+2
* | Introduce `render :plain` for render plain textPrem Sichanugrist2014-02-181-2/+10
* | Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-183-7/+16
* | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-2/+2
* | Correct prestreaming controller response status.Kevin Casey2014-02-151-0/+2
* | No variant should also be picked up by variant.any if variant.none is not def...David Heinemeier Hansson2014-02-131-1/+1
* | Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-131-2/+2
* | Variant negotiationLukasz Strzalkowski2014-02-132-10/+24
* | rm warning about variable shadowingGodfrey Chan2014-02-111-2/+2
* | Migrate hash-based cookie values correctlyGodfrey Chan2014-02-111-2/+4
* | Missed FlashHash#replaceGodfrey Chan2014-02-111-1/+1
* | Fixed broken flash testsGodfrey Chan2014-02-111-1/+1
* | Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-111-20/+40
* | Stringify the incoming hash in FlashHashGuillermo Iguaran2014-02-111-1/+3
* | Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-111-4/+15
* | Added HybridSerializer to upgrade existing marshal cookies (wip: need tests)Godfrey Chan2014-02-111-0/+14
* | Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-114-44/+30
* | Set the :shallow_path as each scope is generatedAndrew White2014-02-091-1/+12
* | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-091-1/+1
|\ \
| * | Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-081-1/+1
* | | FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
|/ /
* | Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5