Skip to content

Commit

Permalink
Merge pull request #29386 from y-yagi/remove_unreachable_code
Browse files Browse the repository at this point in the history
Remove unreachable code
  • Loading branch information
guilleiguaran committed Jun 8, 2017
2 parents 379a0b4 + d933175 commit 831ef69
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions activesupport/lib/active_support/railtie.rb
Expand Up @@ -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" raise e.exception "tzinfo-data is not present. Please add gem 'tzinfo-data' to your Gemfile and run bundle install"
end end
require "active_support/core_ext/time/zones" require "active_support/core_ext/time/zones"
zone_default = Time.find_zone!(app.config.time_zone) Time.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
end end


# Sets the default week start # Sets the default week start
Expand Down

0 comments on commit 831ef69

Please sign in to comment.