diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 09:51:54 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 09:51:54 -0700 |
| commit | 4ee7d923e1962bec68d56c565d574672dce5b692 (patch) | |
| tree | f83f71a8a5581cdab383fdaf10596cf40a565973 | |
| parent | 06474c15530406d81e03e7f6ad0dcccdf2a54ce3 (diff) | |
| parent | ab4dbb110d67376ce3025e9aba89d70683ab1325 (diff) | |
| download | rails-4ee7d923e1962bec68d56c565d574672dce5b692.tar.gz rails-4ee7d923e1962bec68d56c565d574672dce5b692.tar.bz2 rails-4ee7d923e1962bec68d56c565d574672dce5b692.zip | |
Merge pull request #1215 from vatrai/remove_require_tzinfo
remove require active_support/tzinfo as file dosent exists #TODO fix
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index abd585b64f..728921a069 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -315,10 +315,8 @@ module ActiveSupport tzinfo.period_for_local(time, dst) end - # TODO: Preload instead of lazy load for thread safety def self.find_tzinfo(name) - require 'active_support/tzinfo' unless defined?(::TZInfo) - ::TZInfo::TimezoneProxy.new(MAPPING[name] || name) + TZInfo::TimezoneProxy.new(MAPPING[name] || name) end class << self |