aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-083-1/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make CSRF failure logging optional/configurable.
| * | | | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default.
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * | | | | | :scissors:Zachary Scott2014-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also addresses rails/docrails#169 and rails/rails#14159
* | | | | | | Merge pull request #14285 from ↵Aaron Patterson2014-03-065-42/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body`
| * | | | | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-055-42/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
* / | | | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | / / / Variants in ActionView::DigestorPiotr Chmolowski2014-03-041-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take variants into account when calculating template digests in ActionView::Digest. Digestor#digest now takes a hash as an argument to support variants and allow more flexibility in the future. Old-style arguments have been deprecated. Fixes #14242
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | when an exception happens in an action before the response has been committed, then we should re-raise the exception in the main thread. This lets us reuse the existing exception handling.
* | | | live controllers should have live responsesAaron Patterson2014-02-283-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | detect the type of controller we're testing and return the right type of response based on that controller. This allows us to stop doing the weird sleep thing.
* | | | set the error callback to a nice default in case nobody set an error ↵Aaron Patterson2014-02-282-1/+8
| | | | | | | | | | | | | | | | callback and an error happens
* | | | Fix controller test not resetting @_url_optionsTony Wooster2014-02-264-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4f2cd3e9 introduced a bug by reordering the call to `@controller.recycle!` above the call to `build_request_uri`. The impact of this was that the `@_url_options` cache ends up not being reset between building a request URI (occurring within the test controller) and the firing of the actual request. We encountered this bug because we had the following setup: class MinimumReproducibleController < ActionController::Base before_filter { @param = 'param' } def index render text: url_for(params) end def default_url_options { custom_opt: @param } end end def test_index get :index # builds url, then fires actual request end The first step in `get :index` in the test suite would populate the @_url_options cache. The subsequent call to `url_for` inside of the controller action would then utilize the uncleared cache, thus never calling the now-updated default_url_options. This commit fixes this bug calling recycle! twice, and removes a call to set response_body, which should no longer be needed since we're recycling the request object explicitly.
* | | | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-551/+1
| | | | | | | | | | | | | | | | Remove 4-1 related entries from master [ci skip]
* | | | `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.Yves Senn2014-02-251-1/+0
| | | | | | | | | | | | | | | | See 449039a86d802871b707dfb51ac1ed96d53526f9 for the original commit.
* | | | Simple Sungularize ActionController::UnpermittedParameters error in case ↵Serj L2014-02-243-6/+28
| | | | | | | | | | | | | | | | when only 1 parameter is unpermitted.
* | | | 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
|/ / / | | | | | | | | | closes #14125
* | | Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-183-8/+8
| | | | | | | | | | | | ref #14062
* | | Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * | | 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
| | | | | | | | | | | | | | | | | | | | Setting this attribute to `true` will remove the content type header from the request. This is use in `render :body` feature.
* | | | Cleanup `ActionController::Rendering`Prem Sichanugrist2014-02-181-11/+27
| | | |
* | | | Introduce `render :html` for render HTML stringPrem Sichanugrist2014-02-183-2/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail.
* | | | Introduce `render :plain` for render plain textPrem Sichanugrist2014-02-183-2/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is as an option to render content with a content type of `text/plain`. This is the preferred option if you are planning to render a plain text content. Please see #12374 for more detail.
* | | | Update hash format for render_text_testPrem Sichanugrist2014-02-181-18/+18
| | | |
* | | | Introduce `render :body` for render raw contentPrem Sichanugrist2014-02-186-7/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail.
* | | | Fix parameter naming in RemoteIp middleware constructor methodKalabiYau2014-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies
* | | | Correct prestreaming controller response status.Kevin Casey2014-02-153-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request)
* | | | No variant should also be picked up by variant.any if variant.none is not ↵David Heinemeier Hansson2014-02-132-1/+5
| | | | | | | | | | | | | | | | defined (just like any other variant)
* | | | Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
| | | |
* | | | Variant negotiationLukasz Strzalkowski2014-02-134-11/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end
* | | | rm warning about variable shadowingGodfrey Chan2014-02-111-2/+2
| | | |
* | | | Migrate hash-based cookie values correctlyGodfrey Chan2014-02-111-2/+4
| | | |
* | | | Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-111-15/+14
| | | | | | | | | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template.
* | | | Added changelog entry for Flash changes [ci skip]Godfrey Chan2014-02-111-0/+4
| | | |
* | | | Missed FlashHash#replaceGodfrey Chan2014-02-111-1/+1
| | | |
* | | | Fixed broken flash testsGodfrey Chan2014-02-112-5/+5
| | | |
* | | | Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-112-35/+57
| | | |
* | | | Stringify the incoming hash in FlashHashGuillermo Iguaran2014-02-111-1/+3
| | | | | | | | | | | | | | | | | | | | Stringify the incoming as well to handle incoming symbol keys from marshalled sessions
* | | | Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-112-4/+25
| | | |
* | | | Changed the tests to ensure HybridSerializer actually migrates the cookies ↵Godfrey Chan2014-02-111-10/+18
| | | | | | | | | | | | | | | | (currently failing)
* | | | Fixed minor typo in test codeGodfrey Chan2014-02-111-1/+1
| | | |
* | | | Tests for the HybridSerializerRafael Mendonça França2014-02-111-0/+68
| | | |
* | | | Removed an old testGodfrey Chan2014-02-111-5/+0
| | | |
* | | | Added HybridSerializer to upgrade existing marshal cookies (wip: need tests)Godfrey Chan2014-02-111-0/+14
| | | |
* | | | Just very so slightly better test coverageGodfrey Chan2014-02-111-15/+57
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 16:02:45 +0000