diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-06-07 19:36:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-07 19:36:46 -0500 |
commit | 831ef696b1a054ffd6dea26ce39fe58b14ae99f4 (patch) | |
tree | 6f207efe21863c67a83edcb86d122d60eae6335b /activesupport | |
parent | 379a0b42daf0d8e14130db7fd886d05d8d88e3f2 (diff) | |
parent | d93317534ca6350ae9f8a9f285250e5b63728ba3 (diff) | |
download | rails-831ef696b1a054ffd6dea26ce39fe58b14ae99f4.tar.gz rails-831ef696b1a054ffd6dea26ce39fe58b14ae99f4.tar.bz2 rails-831ef696b1a054ffd6dea26ce39fe58b14ae99f4.zip |
Merge pull request #29386 from y-yagi/remove_unreachable_code
Remove unreachable code
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/railtie.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index 1b4ecf4d72..af1d5bd615 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -28,14 +28,7 @@ module ActiveSupport raise e.exception "tzinfo-data is not present. Please add gem 'tzinfo-data' to your Gemfile and run bundle install" end require "active_support/core_ext/time/zones" - zone_default = Time.find_zone!(app.config.time_zone) - - unless zone_default - raise "Value assigned to config.time_zone not recognized. " \ - 'Run "rake time:zones:all" for a time zone names list.' - end - - Time.zone_default = zone_default + Time.zone_default = Time.find_zone!(app.config.time_zone) end # Sets the default week start |