Permalink
Browse files

Merge pull request #1215 from vatrai/remove_require_tzinfo

remove require active_support/tzinfo as file dosent exists #TODO fix
  • Loading branch information...
2 parents 06474c1 + ab4dbb1 commit 4ee7d923e1962bec68d56c565d574672dce5b692 @josevalim josevalim committed May 22, 2011
Showing with 1 addition and 3 deletions.
  1. +1 −3 activesupport/lib/active_support/values/time_zone.rb
@@ -315,10 +315,8 @@ def period_for_local(time, dst=true)
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

0 comments on commit 4ee7d92

Please sign in to comment.