diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-10-15 18:51:04 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-10-15 18:51:04 +0100 |
| commit | 3acc590d5080279fe726ac978b713304e11f35da (patch) | |
| tree | be4074a0b352ad7c6daea34512c58e96f8a94bc1 /activesupport/lib | |
| parent | d6919c524ab441429579a75af9335865d1b7d42a (diff) | |
| parent | 8e847dcde8fdbd8dfab16f917babf9b300399e22 (diff) | |
| download | rails-3acc590d5080279fe726ac978b713304e11f35da.tar.gz rails-3acc590d5080279fe726ac978b713304e11f35da.tar.bz2 rails-3acc590d5080279fe726ac978b713304e11f35da.zip | |
Merge pull request #21946 from davidcelis/fix-time-zone-utc-predicate
Expand support for ActiveSupport::TimeWithZone#utc?
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 3592dcba39..910c1f91a5 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -102,7 +102,7 @@ module ActiveSupport # Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)' # Time.zone.now.utc? # => false def utc? - time_zone.name == 'UTC' + period.offset.abbreviation == :UTC || period.offset.abbreviation == :UCT end alias_method :gmt?, :utc? |