Permalink
Browse files

Merge pull request #29386 from y-yagi/remove_unreachable_code

Remove unreachable code
  • Loading branch information...
guilleiguaran committed Jun 8, 2017
2 parents 379a0b4 + d933175 commit 831ef696b1a054ffd6dea26ce39fe58b14ae99f4
Showing with 1 addition and 8 deletions.
  1. +1 −8 activesupport/lib/active_support/railtie.rb
@@ -28,14 +28,7 @@ class Railtie < Rails::Railtie # :nodoc:
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

0 comments on commit 831ef69

Please sign in to comment.