diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-06-22 22:06:06 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-22 22:06:06 -0300 |
commit | abec128cb501023f1b2d0327139b5cb0b670b5f1 (patch) | |
tree | 6b8c4502d028e5cda5d0fbac42fdb4d0960ad0f6 | |
parent | 48f896cd504331a5d1d78324a4b7d5969a06606e (diff) | |
parent | 2ffa001faa3e9d0295358dfe716b17c54623a086 (diff) | |
download | rails-abec128cb501023f1b2d0327139b5cb0b670b5f1.tar.gz rails-abec128cb501023f1b2d0327139b5cb0b670b5f1.tar.bz2 rails-abec128cb501023f1b2d0327139b5cb0b670b5f1.zip |
Merge pull request #25480 from kmcphillips/master
Update changelog for ActiveSupport::Logger.broadcast #silence and config.assets.quiet = true
-rw-r--r-- | activesupport/CHANGELOG.md | 6 | ||||
-rw-r--r-- | railties/CHANGELOG.md | 5 |
2 files changed, 11 insertions, 0 deletions
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* |