Permalink
Browse files

Update changelog for #25351

  • Loading branch information...
kmcphillips committed Jun 23, 2016
1 parent b081633 commit 2ffa001faa3e9d0295358dfe716b17c54623a086
Showing with 5 additions and 0 deletions.
  1. +5 −0 railties/CHANGELOG.md
View
@@ -1,3 +1,8 @@
* Default `config.assets.quiet = true` in the development environment. Suppress

This comment has been minimized.

Show comment
Hide comment
@claudiob

claudiob Mar 21, 2017

Member

@rafaelfranca This change is documented in the CHANGELOG of the current master (that is, Rails 5.1) but was actually introduced in Rails 5.0 through #25351.

Am I correct in removing this entry from the CHANGELOG in the master branch and add it to the CHANGELOG of the 5-0-stable branch?

It's similar to what I did in cd3c035… just wanted your 👍 before proceeding. Thanks!

@claudiob

claudiob Mar 21, 2017

Member

@rafaelfranca This change is documented in the CHANGELOG of the current master (that is, Rails 5.1) but was actually introduced in Rails 5.0 through #25351.

Am I correct in removing this entry from the CHANGELOG in the master branch and add it to the CHANGELOG of the 5-0-stable branch?

It's similar to what I did in cd3c035… just wanted your 👍 before proceeding. Thanks!

This comment has been minimized.

Show comment
Hide comment
@rafaelfranca

rafaelfranca Mar 21, 2017

Member

We have duplicated changelogs for bug fixes because a bug can exist in 5.0.1 and 5.1.0 and fixing in 5.0.1 doesn't necessarily means that it is also fixed in 5.1.0. About this specific change, it doesn't seems to be in 5.0 https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt, so I don't think it was introduced in 5.0

@rafaelfranca

rafaelfranca Mar 21, 2017

Member

We have duplicated changelogs for bug fixes because a bug can exist in 5.0.1 and 5.1.0 and fixing in 5.0.1 doesn't necessarily means that it is also fixed in 5.1.0. About this specific change, it doesn't seems to be in 5.0 https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt, so I don't think it was introduced in 5.0

This comment has been minimized.

Show comment
Hide comment
@claudiob

claudiob Mar 21, 2017

Member

@rafaelfranca I think this specific change was actually introduced in 5.0:

https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L51

It's true that the setting was initially added to assets.rb (on June 10th), but then it was moved to development.rb (on June 16th): https://github.com/rails/rails/commits/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt

That's why I'm suggesting to move this CHANGELOG line from the 5-1-stable branch to the 5-0-stable branch.

@claudiob

claudiob Mar 21, 2017

Member

@rafaelfranca I think this specific change was actually introduced in 5.0:

https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L51

It's true that the setting was initially added to assets.rb (on June 10th), but then it was moved to development.rb (on June 16th): https://github.com/rails/rails/commits/5-0-stable/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt

That's why I'm suggesting to move this CHANGELOG line from the 5-1-stable branch to the 5-0-stable branch.

This comment has been minimized.

Show comment
Hide comment
@rafaelfranca
@rafaelfranca
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*

0 comments on commit 2ffa001

Please sign in to comment.