aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18423 from jone/remove-default-headerYves Senn2015-01-093-0/+35
|\ | | | | | | Default headers, removed in controller actions, will not be reapplied to the test response
| * Default headers, removed in controller actions, will not be reapplied to the ↵Jonas Baumann2015-01-093-0/+35
|/ | | | test response.
* Deprecate all *_filter callbacks in favor of *_action callbacksAbdelkader Boudih2015-01-083-9/+37
|
* Merge pull request #18404 from claudiob/rebase-14549Rafael Mendonça França2015-01-082-0/+44
|\ | | | | Add test case and documentation for skip_before_filter.
| * Add test/doc for :if/:except in skip_before_actionclaudiob2015-01-082-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new test/docs further explain the conflicts that can happen when mixing `:if`/`:unless` options with `:only`/`:except` options in `skip_before_action`. The gist is that "positive" filters always have priority over negative ones. The previous commit already showed that `:only` has priority over `:if`. This commit shows that `:if` has priority over `:except`. For instance, the following snippets are equivalent: ```ruby skip_before_action :some_callback, if: -> { condition }, except: action ``` ```ruby skip_before_action :some_callback, if: -> { condition } ```
| * Add test case and documentation for skip_before_filter.Lauro Caetano2015-01-082-0/+22
| | | | | | | | | | | | | | | | Test case for using skip_before_filter with the options :only and :if both present. In this case, the :if option will be ignored and :only will be executed. Closes #14549 (the commit was cherry-picked from there).
* | Fix the example (for realz)David Heinemeier Hansson2015-01-081-1/+1
| |
* | Fix the exampleDavid Heinemeier Hansson2015-01-081-1/+1
| |
* | Add prepend option to protect_from_forgery.Josef Šimánek2015-01-083-1/+91
| |
* | Remove ActionController::HideActions (closes #18336)brainopia2015-01-065-93/+7
|/
* Changing sets -> set Lindsey Bieda2015-01-061-1/+1
| | | Updating some minor grammar issue.
* Improve protect_from_forgery documentation. [ci skip].Josef Šimánek2015-01-061-3/+3
|
* Merge pull request #18341 from aditya-kapoor/remove-unneeded-checksRafael Mendonça França2015-01-051-2/+1
|\ | | | | remove unneeded check since /_one_time_conditions/ is not present anymore.
| * remove unneeded check since /_one_time_conditions/ is removedAditya Kapoor2015-01-051-2/+1
| |
* | Reset template assertions without warningsbrainopia2015-01-051-2/+4
|/
* Document all options for protect_from_forgery.Josef Šimánek2015-01-041-8/+2
| | | | [ci skip]
* Remove unused requireCarlos Antonio da Silva2015-01-041-1/+0
| | | | | This was used by the respond_to/respond_with implementation on this file, which is now extracted to the responders gem.
* Remove respond_to/respond_with placeholder methodsCarlos Antonio da Silva2015-01-043-52/+5
| | | | This functionality has been extracted to the responders gem.
* Remove Struct#to_h backportRafael Mendonça França2015-01-041-1/+0
|
* Remove some comments about Ruby 1.9 behaviorsRafael Mendonça França2015-01-041-1/+1
|
* Remove unneeded requiresRafael Mendonça França2015-01-043-3/+0
| | | | These requires were added only to change deprecation message
* Remove deprecated assertion filesRafael Mendonça França2015-01-044-9/+4
|
* Remove deprecated usage of string keys in URL helpersRafael Mendonça França2015-01-043-37/+5
|
* Remove deprecated `only_path` option on `*_path` helpersRafael Mendonça França2015-01-043-72/+5
|
* Remove deprecate `*_path` helpers in email viewsRafael Mendonça França2015-01-042-39/+4
|
* Remove deprecated `NamedRouteCollection#helpers`Rafael Mendonça França2015-01-042-8/+4
|
* Remove deprecated support to define routes with `:to` option thatRafael Mendonça França2015-01-043-47/+10
| | | | doesn't contain `#`
* Remove deprecated `ActionDispatch::Response#to_ary`Rafael Mendonça França2015-01-043-31/+6
|
* Remove deprecated `ActionDispatch::Request#deep_munge`Rafael Mendonça França2015-01-042-9/+4
|
* Remove deprecated `ActionDispatch::Http::Parameters#symbolized_path_parameters`Rafael Mendonça França2015-01-042-8/+4
|
* Remove deprecated option `use_route` in controller testsRafael Mendonça França2015-01-044-63/+5
|
* Merge pull request #17227 from claudiob/explicitly-abort-callbacksRafael Mendonça França2015-01-031-1/+1
|\ | | | | | | | | | | | | Introduce explicit way of halting callback chains by throwing :abort. Deprecate current implicit behavior of halting callback chains by returning `false` in apps ported to Rails 5.0. Completely remove that behavior in brand new Rails 5.0 apps. Conflicts: railties/CHANGELOG.md
| * Throw :abort halts default CallbackChainsclaudiob2015-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes arguments and default value of CallbackChain's :terminator option. After this commit, Chains of callbacks defined **without** an explicit `:terminator` option will be halted as soon as a `before_` callback throws `:abort`. Chains of callbacks defined **with** a `:terminator` option will maintain their existing behavior of halting as soon as a `before_` callback matches the terminator's expectation. For instance, ActiveModel's callbacks will still halt the chain when a `before_` callback returns `false`.
* | Fix a few typos [ci skip]Robin Dupret2015-01-032-3/+3
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-033-18/+24
|\ \
| * | Better docs for AbstractControllerclaudiob2014-12-223-18/+24
| | | | | | | | | | | | | | | | | | Fixes internal links, adds examples and set fixed-width fonts. [ci skip]
* | | Merge pull request #10380 from JonRowe/test_all_domain_2_letter_tldRafael Mendonça França2015-01-021-0/+7
|\ \ \ | |_|/ |/| | | | | Assert that 2 letter tlds with 3 letter domain names work when option specified.
| * | add test asserting that 2 letter tlds with 3 letter domain names work when ↵Jon Rowe2013-04-301-0/+7
| | | | | | | | | | | | option specified
* | | Merge pull request #8740 from amatsuda/missing_source_fileRafael Mendonça França2015-01-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | replace use of MissingSourceFile with LoadError Conflicts: activesupport/test/core_ext/load_error_test.rb
| * | | replace use of MissingSourceFile with LoadErrorAkira Matsuda2013-01-041-1/+1
| | | |
* | | | Merge pull request #17978 from kommen/fixed-pr-14903Rafael Mendonça França2015-01-023-4/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure append_info_to_payload is called even if an exception is raised. Conflicts: actionpack/CHANGELOG.md
| * | | | Ensure append_info_to_payload is called even if an exception is raised.Dieter Komendera2014-12-103-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: * https://github.com/rails/rails/pull/14903 * https://github.com/roidrage/lograge/issues/37 Some code by mxrguspxrt from #14903.
* | | | | Integration requests should work in contexts without setup and teardownbrainopia2015-01-022-1/+26
| | | | |
* | | | | Merge pull request #18271 from arunagw/change-copyright-yearRobin Dupret2015-01-013-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Update copyright notices to 2015 [ci skip]
| * | | | | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-313-3/+3
| | | | | |
* | | | | | Correctly use the response's status code calling headRobin Dupret2014-12-314-5/+23
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 20fece1 introduced the `_status_code` method to fix calls to `head :ok`. This method has been added on both ActionController::Metal and ActionDispatch::Response. As for the latter, this method is just equivalent to the `response_code` one so commit aefec3c removed it from the `Reponse` object so call to the `_status_code` method on an ActionController::Base instance would be handled by the `Metal` class (which `Base` inherits from) but the status code is not updated according to the response at this level. The fix is to actually rely on `response_code` for ActionController::Base instances but this method doesn't exist for bare Metal controllers so we need to define it.
* | | | | stop referencing `env` in url_forAaron Patterson2014-12-302-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | encapsulate env in the request so that we can eventually move away from the env hash
* | | | | use methods on the request rather than direct hash accessAaron Patterson2014-12-302-2/+10
| | | | | | | | | | | | | | | | | | | | this will help decouple us from using the rack env hash
* | | | | Remove single space response body for head requestPrathamesh Sonpatki2014-12-303-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The single space response was added due to a bug in safari in https://github.com/rails/rails/commit/cb0f8fda9652c4d24d04693bdb82cecd3b067e5c and https://github.com/rails/rails/commit/807df4fcf021fc4d15972aa1c17ba7398d43ab0d. - This was removed from the `render nothing: true` in https://github.com/rails/rails/pull/14883. - Removing it from response of :head also. As :head is more obvious alternative to call `render nothing: true`(http://guides.rubyonrails.org/layouts_and_rendering.html#using-head-to-build-header-only-responses), removing it from head method also. - Closes #18253.
* | | | | Merge pull request #18251 from tjgrathwell/fix-polymorphic-routes-to-modelRafael Mendonça França2014-12-302-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix form_for to work with objects that implement to_model