aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14329 from pch/digestor-lookup-fixRafael Mendonça França2014-03-142-0/+24
|\
| * Don't pass variant in params, it's ignoredŁukasz Strzałkowski2014-03-131-1/+1
| * Ensure LookupContext in Digestor selects correct variantPiotr Chmolowski2014-03-092-0/+24
* | use the body proxy to freeze headersAaron Patterson2014-03-125-12/+57
* | just ask the response for the commit status, we do not need to ask the jarAaron Patterson2014-03-121-1/+1
* | only write the jar if the response isn't committedAaron Patterson2014-03-126-10/+57
* | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \
| * | [ci skip] Add documentation for original_fullpath.Lauro Caetano2014-03-111-0/+7
* | | 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
* | | Move changelog entry to the top, highlight module name [ci skip]Carlos Antonio da Silva2014-03-081-5/+6
* | | Copy shallow options from normal options when using scopeAndrew White2014-03-082-1/+50
* | | Pull namespace defaults out of the options hashAndrew White2014-03-082-3/+140
* | | Only use shallow nested scope when depth is > 1Andrew White2014-03-082-20/+83
* | | 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-083-1/+28
|\ \ \
| * | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
* | | | 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-065-42/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-055-42/+16
| | |/ / | |/| |
* / | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
|/ / /
* | / Variants in ActionView::DigestorPiotr Chmolowski2014-03-041-2/+2
| |/ |/|
* | Add spaces to deep_munge log message.Shuhei Kagawa2014-03-031-3/+3
* | Refactor tests from BaseRackTest into BaseRequestTestZachary Scott2014-03-012-370/+386
* | Replace map.flatten(1) with flat_mapErik Michaels-Ober2014-02-282-5/+5
* | make sure we wait for the threads to shut down before asserting closureAaron Patterson2014-02-281-0/+1
* | use built-in exception handling in live controllersAaron Patterson2014-02-282-17/+22
* | live controllers should have live responsesAaron Patterson2014-02-283-21/+38
* | set the error callback to a nice default in case nobody set an error callback...Aaron Patterson2014-02-282-1/+8
* | Fix controller test not resetting @_url_optionsTony Wooster2014-02-264-1/+29
* | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-551/+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-243-6/+28
* | 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-184-11/+20
* | Cleanup `ActionController::Rendering`Prem Sichanugrist2014-02-181-11/+27
* | Introduce `render :html` for render HTML stringPrem Sichanugrist2014-02-183-2/+201
* | Introduce `render :plain` for render plain textPrem Sichanugrist2014-02-183-2/+186
* | Update hash format for render_text_testPrem Sichanugrist2014-02-181-18/+18
* | Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-186-7/+211
* | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-2/+2
* | Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
* | No variant should also be picked up by variant.any if variant.none is not def...David Heinemeier Hansson2014-02-132-1/+5
* | Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
* | Variant negotiationLukasz Strzalkowski2014-02-134-11/+50