diff options
| -rw-r--r-- | activerecord/test/cases/finder_test.rb | 7 | ||||
| -rw-r--r-- | guides/source/getting_started.md | 2 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 12 |
3 files changed, 9 insertions, 12 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index d8bc0653a1..51a8a13d04 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -876,11 +876,4 @@ class FinderTest < ActiveRecord::TestCase ensure old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ') end - - def with_active_record_default_timezone(zone) - old_zone, ActiveRecord::Base.default_timezone = ActiveRecord::Base.default_timezone, zone - yield - ensure - ActiveRecord::Base.default_timezone = old_zone - end end diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md index a0e0975d62..58bf8bbe90 100644 --- a/guides/source/getting_started.md +++ b/guides/source/getting_started.md @@ -575,6 +575,8 @@ If you submit the form again now, Rails will complain about not finding the `show` action. That's not very useful though, so let's add the `show` action before proceeding. +First we need to add a new `route` in `config/routes.rb`. + ```ruby post GET /posts/:id(.:format) posts#show ``` diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index dd357bfbc5..30328a0c19 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Changed stylesheet load order in the stylesheet manifest generator. + Fixes #11639. + + *Pawel Janiak* + * Added generated unit test for generator generator using new `test:generators` rake task. @@ -49,7 +54,8 @@ *John Wang* -* Clearing autoloaded constants triggers routes reloading [Fixes #10685]. +* Clearing autoloaded constants triggers routes reloading. + Fixes #10685. *Xavier Noria* @@ -68,8 +74,4 @@ *Sıtkı Bağdat* -* Changed stylesheet load order in the stylesheet manifest generator. [Fixes #11639] - - *Pawel Janiak* - Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes. |