Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Relax Rack dependency | Santiago Pastorino | 2015-01-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | Rack is very carefully released, we should be able to upgrade minor versions without much effort. We are a bunch of Rails core who are also Rack core members so there won't be any issue with that. And in case there's something wrong, we should fix on both sides. Even though, doesn't seem like we will have a 1.7 version, this will be useful as an example for when we go with Rack 2.0. We should ~> 2.0. | |||||
* | | Remove unused AV fixtures from AP tests | claudiob | 2015-01-11 | 1 | -65/+0 | |
| | | | | | | | | | | | | | | | | | | When `render` was moved from ActionPack to ActionView in acc8e259, some fixtures required by the tests were duplicated, but they are actually only required by ActionView tests. To give one example, `double_render` is already defined [in the AV tests](https://github.com/rails/rails/blob/72139d8d310d896db78eaec98582c7a638135102/actionview/test/actionpack/controller/render_test.rb#L407) and is never used in the ActionPack tests. | |||||
* | | Merge pull request #18435 from kuldeepaggarwal/f-remove-unnecessary-require | Rafael Mendonça França | 2015-01-11 | 1 | -1/+0 | |
|\ \ | | | | | | | No need of requiring `rbconfig`, it is by-default loaded | |||||
| * | | No need of requiring `rbconfig`, it is by-default loaded | Kuldeep Aggarwal | 2015-01-10 | 1 | -1/+0 | |
| | | | ||||||
* | | | remove autoload HideActions, no longer exist | yuuji.yaginuma | 2015-01-11 | 1 | -1/+0 | |
|/ / | ||||||
* | | formatting pass over CHANGELOGs. [ci skip] | Yves Senn | 2015-01-10 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #18423 from jone/remove-default-header | Yves Senn | 2015-01-09 | 3 | -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 Baumann | 2015-01-09 | 3 | -0/+35 | |
|/ / | | | | | | | test response. | |||||
* | | Deprecate all *_filter callbacks in favor of *_action callbacks | Abdelkader Boudih | 2015-01-08 | 3 | -9/+37 | |
| | | ||||||
* | | Merge pull request #18404 from claudiob/rebase-14549 | Rafael Mendonça França | 2015-01-08 | 2 | -0/+44 | |
|\ \ | | | | | | | Add test case and documentation for skip_before_filter. | |||||
| * | | Add test/doc for :if/:except in skip_before_action | claudiob | 2015-01-08 | 2 | -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 Caetano | 2015-01-08 | 2 | -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 Hansson | 2015-01-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix the example | David Heinemeier Hansson | 2015-01-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add prepend option to protect_from_forgery. | Josef Šimánek | 2015-01-08 | 3 | -1/+91 | |
| | | | ||||||
* | | | Remove ActionController::HideActions (closes #18336) | brainopia | 2015-01-06 | 5 | -93/+7 | |
|/ / | ||||||
* | | Changing sets -> set | Lindsey Bieda | 2015-01-06 | 1 | -1/+1 | |
| | | | | | | Updating some minor grammar issue. | |||||
* | | Improve protect_from_forgery documentation. [ci skip]. | Josef Šimánek | 2015-01-06 | 1 | -3/+3 | |
| | | ||||||
* | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checks | Rafael Mendonça França | 2015-01-05 | 1 | -2/+1 | |
|\ \ | | | | | | | remove unneeded check since /_one_time_conditions/ is not present anymore. | |||||
| * | | remove unneeded check since /_one_time_conditions/ is removed | Aditya Kapoor | 2015-01-05 | 1 | -2/+1 | |
| | | | ||||||
* | | | Reset template assertions without warnings | brainopia | 2015-01-05 | 1 | -2/+4 | |
|/ / | ||||||
* | | Document all options for protect_from_forgery. | Josef Šimánek | 2015-01-04 | 1 | -8/+2 | |
| | | | | | | | | [ci skip] | |||||
* | | Remove unused require | Carlos Antonio da Silva | 2015-01-04 | 1 | -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 methods | Carlos Antonio da Silva | 2015-01-04 | 3 | -52/+5 | |
| | | | | | | | | This functionality has been extracted to the responders gem. | |||||
* | | Remove Struct#to_h backport | Rafael Mendonça França | 2015-01-04 | 1 | -1/+0 | |
| | | ||||||
* | | Remove some comments about Ruby 1.9 behaviors | Rafael Mendonça França | 2015-01-04 | 1 | -1/+1 | |
| | | ||||||
* | | Remove unneeded requires | Rafael Mendonça França | 2015-01-04 | 3 | -3/+0 | |
| | | | | | | | | These requires were added only to change deprecation message | |||||
* | | Remove deprecated assertion files | Rafael Mendonça França | 2015-01-04 | 4 | -9/+4 | |
| | | ||||||
* | | Remove deprecated usage of string keys in URL helpers | Rafael Mendonça França | 2015-01-04 | 3 | -37/+5 | |
| | | ||||||
* | | Remove deprecated `only_path` option on `*_path` helpers | Rafael Mendonça França | 2015-01-04 | 3 | -72/+5 | |
| | | ||||||
* | | Remove deprecate `*_path` helpers in email views | Rafael Mendonça França | 2015-01-04 | 2 | -39/+4 | |
| | | ||||||
* | | Remove deprecated `NamedRouteCollection#helpers` | Rafael Mendonça França | 2015-01-04 | 2 | -8/+4 | |
| | | ||||||
* | | Remove deprecated support to define routes with `:to` option that | Rafael Mendonça França | 2015-01-04 | 3 | -47/+10 | |
| | | | | | | | | doesn't contain `#` | |||||
* | | Remove deprecated `ActionDispatch::Response#to_ary` | Rafael Mendonça França | 2015-01-04 | 3 | -31/+6 | |
| | | ||||||
* | | Remove deprecated `ActionDispatch::Request#deep_munge` | Rafael Mendonça França | 2015-01-04 | 2 | -9/+4 | |
| | | ||||||
* | | Remove deprecated `ActionDispatch::Http::Parameters#symbolized_path_parameters` | Rafael Mendonça França | 2015-01-04 | 2 | -8/+4 | |
| | | ||||||
* | | Remove deprecated option `use_route` in controller tests | Rafael Mendonça França | 2015-01-04 | 4 | -63/+5 | |
| | | ||||||
* | | Merge pull request #17227 from claudiob/explicitly-abort-callbacks | Rafael Mendonça França | 2015-01-03 | 1 | -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 CallbackChains | claudiob | 2015-01-02 | 1 | -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 Dupret | 2015-01-03 | 2 | -3/+3 | |
| |/ |/| | ||||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-01-03 | 3 | -18/+24 | |
|\ \ | ||||||
| * | | Better docs for AbstractController | claudiob | 2014-12-22 | 3 | -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_tld | Rafael Mendonça França | 2015-01-02 | 1 | -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 Rowe | 2013-04-30 | 1 | -0/+7 | |
| | | | | | | | | | | | | option specified | |||||
* | | | Merge pull request #8740 from amatsuda/missing_source_file | Rafael Mendonça França | 2015-01-02 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | replace use of MissingSourceFile with LoadError Conflicts: activesupport/test/core_ext/load_error_test.rb | |||||
| * | | | replace use of MissingSourceFile with LoadError | Akira Matsuda | 2013-01-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #17978 from kommen/fixed-pr-14903 | Rafael Mendonça França | 2015-01-02 | 3 | -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 Komendera | 2014-12-10 | 3 | -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 teardown | brainopia | 2015-01-02 | 2 | -1/+26 | |
| | | | | | ||||||
* | | | | | Merge pull request #18271 from arunagw/change-copyright-year | Robin Dupret | 2015-01-01 | 3 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update copyright notices to 2015 [ci skip] |