aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-17 03:01:41 -0300
committerGitHub <noreply@github.com>2016-07-17 03:01:41 -0300
commit6d645a8ec415b84f44781ef6a363f01ece5ff6cb (patch)
tree3ac4343fc5a40418c8799146bdcb1c78ae882ce6
parentc1e38d68a2b1fcf1dd49c3bd58a604b928cd1234 (diff)
parent91251fdcbd150fc1ec3542ebd2e950bc7f66bf3a (diff)
downloadrails-6d645a8ec415b84f44781ef6a363f01ece5ff6cb.tar.gz
rails-6d645a8ec415b84f44781ef6a363f01ece5ff6cb.tar.bz2
rails-6d645a8ec415b84f44781ef6a363f01ece5ff6cb.zip
Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializers
CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--activerecord/CHANGELOG.md6
-rw-r--r--railties/CHANGELOG.md11
3 files changed, 16 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 1aeb58a612..d50cbaee38 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-* Check `request.path_parameters` encoding at the point they're set
+* Check `request.path_parameters` encoding at the point they're set.
Check for any non-UTF8 characters in path parameters at the point they're
set in `env`. Previously they were checked for when used to get a controller
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5cbfe9aa6f..1d0e4b32a3 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,7 +1,9 @@
-* Add newline between each migration in `structure.sql`
+* Add newline between each migration in `structure.sql`.
Keeps schema migration inserts as a single commit, but allows for easier
- git diff-ing. Fixes #25504.
+ git diffing.
+
+ Fixes #25504.
*Grey Baker*, *Norberto Lopes*
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f6552a268b..9b8029d565 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -8,6 +8,17 @@
*John Meehan*
+* Display name of the class defining the initializer also in the output
+ of `rails initializers`.
+
+ Before:
+ disable_dependency_loading
+
+ After:
+ DemoApp::Application.disable_dependency_loading
+
+ *ta1kt0me*
+
* Do not run `bundle install` when generating a new plugin.
Since bundler 1.12.0, the gemspec is validated so the `bundle install`