aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
* Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-291-0/+8
|\
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-271-0/+8
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \
| * | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
* | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-282-2/+2
| |/ |/|
* | update comments to reflect that options support is not availableFrederick Cheung2014-03-251-2/+2
* | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-221-1/+1
* | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
* | Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if...Aaron Patterson2014-03-171-10/+11
|\ \
| * | re-raise error if error occurs before committing in streamingKevin Casey2014-03-141-10/+11
* | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-161-1/+5
|/ /
* | use the body proxy to freeze headersAaron Patterson2014-03-123-8/+41
* | 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-124-10/+43
* | 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
* | | | 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