diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 18:42:40 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 18:42:40 -0300 |
| commit | 9644cdcd3deec97a48fcfa53ce75a281e8ff75fa (patch) | |
| tree | 2f0090444a4911cc9845c4abd4f1528954c9cf01 /activesupport/lib/active_support | |
| parent | cf6b13b2be78c5728b23f8a69aad0bf6eaee5fcb (diff) | |
| parent | ab4c900656db249caa6ff363a932168695b9021e (diff) | |
| download | rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.tar.gz rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.tar.bz2 rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.zip | |
Merge pull request #18328 from brainopia/remove_tz_proxy
Use directly TZInfo::Timezone without proxy
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index fd05a5459c..17629eabb3 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -202,7 +202,7 @@ module ActiveSupport end def find_tzinfo(name) - TZInfo::TimezoneProxy.new(MAPPING[name] || name) + TZInfo::Timezone.new(MAPPING[name] || name) end alias_method :create, :new @@ -237,7 +237,7 @@ module ActiveSupport case arg when String begin - @lazy_zones_map[arg] ||= create(arg).tap(&:utc_offset) + @lazy_zones_map[arg] ||= create(arg) rescue TZInfo::InvalidTimezoneIdentifier nil end |