diff options
| author | Jon Moss <me@jonathanmoss.me> | 2017-04-11 18:52:02 -0400 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2017-04-11 18:52:02 -0400 |
| commit | 2b4583f2a2ef94bc8c046e36e2b62ec642bbfb41 (patch) | |
| tree | 1fb315112973c571b0348b916dc968ed8826700b | |
| parent | d4692c92c306184a5f96fff4b38f52e1fc3ee395 (diff) | |
| download | rails-2b4583f2a2ef94bc8c046e36e2b62ec642bbfb41.tar.gz rails-2b4583f2a2ef94bc8c046e36e2b62ec642bbfb41.tar.bz2 rails-2b4583f2a2ef94bc8c046e36e2b62ec642bbfb41.zip | |
Move CHANGELOG.md entry from Active Support to Action Pack
Was looking through #28402, and realized the CHANGELOG.md entry is in the wrong
place. Sorry we didn't catch this during code review :cry:
[ci skip]
| -rw-r--r-- | actionpack/CHANGELOG.md | 12 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index c5b679207a..51cec82801 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1 +1,13 @@ +* Add `action_controller_api` and `action_controller_base` load hooks to be called in `ActiveSupport.on_load` + + `ActionController::Base` and `ActionController::API` have differing implementations. This means that + the one umbrella hook `action_controller` is not able to address certain situations where a method + may not exist in a certain implementation. + + This is fixed by adding two new hooks so you can target `ActionController::Base` vs `ActionController::API` + + Fixes #27013. + + *Julian Nadeau* + Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actionpack/CHANGELOG.md) for previous changes. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 17677d057b..1adc473e1d 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,19 +1,7 @@ -* Add `action_controller_api` and `action_controller_base` load hooks to be called in `ActiveSupport.on_load` - - `ActionController::Base` and `ActionController::API` have differing implementations. This means that - the one umbrella hook `action_controller` is not able to address certain situations where a method - may not exist in a certain implementation. - - This is fixed by adding two new hooks so you can target `ActionController::Base` vs `ActionController::API` - - Fixes #27013. - - *Julian Nadeau* - * Add `fetch_values` for `HashWithIndifferentAccess` The method was originally added to `Hash` in Ruby 2.3.0. *Josh Pencheon* -Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activesupport/CHANGELOG.md) for previous changes.
\ No newline at end of file +Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activesupport/CHANGELOG.md) for previous changes. |