aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionview/CHANGELOG.md2
-rw-r--r--activesupport/CHANGELOG.md6
-rw-r--r--railties/CHANGELOG.md5
3 files changed, 12 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 432e22ad1b..099842025c 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -18,7 +18,7 @@
*Eileen M. Uchitelle*
* `select_tag`'s `include_blank` option for generation for blank option tag, now adds an empty space label,
- when the value as well as content for option tag are empty, so that we confirm with html specification.
+ when the value as well as content for option tag are empty, so that we conform with html specification.
Ref: https://www.w3.org/TR/html5/forms.html#the-option-element.
Generation of option before:
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index d9f23c55ba..b71a26aba2 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Fixed `ActiveSupport::Logger.broadcast` so that calls to `#silence` now
+ properly delegate to all loggers. Silencing now properly suppresses logging
+ to both the log and the console.
+
+ *Kevin McPhillips*
+
* Remove deprecated arguments in `assert_nothing_raised`.
*Rafel Mendonça França*
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 982385438b..83fe6f56a4 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Default `config.assets.quiet = true` in the development environment. Suppress
+ logging of `sprockets-rails` requests by default.
+
+ *Kevin McPhillips*
+
* Ensure `/rails/info` routes match in development for apps with a catch-all globbing route.
*Nicholas Firth-McCoy*