aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Manuel <rfmanuel@alum.mit.edu>2016-01-29 09:27:00 -0600
committerRyan Manuel <rfmanuel@alum.mit.edu>2016-01-29 09:27:00 -0600
commit92e565825d102a0f4d6ed2368d9510008da1da21 (patch)
tree7c8bfd509c15694d78d0325e26e67802d447fb82
parent3a06a06ca9cd508f32e6c7f73662140949c9c748 (diff)
downloadrails-92e565825d102a0f4d6ed2368d9510008da1da21.tar.gz
rails-92e565825d102a0f4d6ed2368d9510008da1da21.tar.bz2
rails-92e565825d102a0f4d6ed2368d9510008da1da21.zip
Implemented pull request changes.
-rw-r--r--guides/source/5_0_release_notes.md3
-rw-r--r--railties/CHANGELOG.md12
2 files changed, 5 insertions, 10 deletions
diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md
index b98983b59d..2650384df3 100644
--- a/guides/source/5_0_release_notes.md
+++ b/guides/source/5_0_release_notes.md
@@ -120,9 +120,6 @@ Please refer to the [Changelog][railties] for detailed changes.
([Pull Request](https://github.com/rails/rails/pull/22457),
[Pull Request](https://github.com/rails/rails/pull/22288))
-* Introduced an `after_bundle` callback for use in Rails plugin templates.
- ([Pull Request](https://github.com/rails/rails/pull/23317))
-
Action Pack
-----------
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 6076940323..f94bb49135 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Add `after_bundle` callbacks in Rails plugin templates. Useful for allowing
+ templates to perform actions that are dependent upon `bundle install`.
+
+ *Ryan Manuel*
+
* Bring back `TEST=` env for `rake test` task.
*Yves Senn*
@@ -448,11 +453,4 @@
*Alex Robbin*
-* Add `after_bundle` callbacks in Rails plugin templates. Useful for allowing
- templates to perform actions that are dependent upon `bundle install`.
-
- Fixes #<23315>
-
- *Ryan Manuel*
-
Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/railties/CHANGELOG.md) for previous changes.