aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-07-19 22:41:25 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-07-19 22:41:25 +0200
commit0bd247cc7679adb3c2e30b46ecc9afd57ac46c45 (patch)
tree0941ec2652edb5d437f54dcdc2030b6c2172f0bc /activesupport/lib
parentff54b96d3f8e78d797b378ebceb03546ac234b44 (diff)
parent46b5b8ef40d81d583978fc7f111f0cd4ead26dfc (diff)
downloadrails-0bd247cc7679adb3c2e30b46ecc9afd57ac46c45.tar.gz
rails-0bd247cc7679adb3c2e30b46ecc9afd57ac46c45.tar.bz2
rails-0bd247cc7679adb3c2e30b46ecc9afd57ac46c45.zip
Merge pull request #20944 from repinel/fix-time-with-zone-eql
Fix `TimeWithZone#eql?` to handle `TimeWithZone` created from `DateTime`
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/time_with_zone.rb2
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 412c72d27c..f8f1b9ac2c 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -247,7 +247,7 @@ module ActiveSupport
end
def eql?(other)
- utc.eql?(other)
+ other.eql?(utc)
end
def hash