aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-23 12:29:03 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2017-07-23 12:29:03 +0200
commit9fbfb4bffe72320cc895e2f4eb4e30e108d58bb2 (patch)
treeee3a9d71641b83f934567bcce86d9a30ceda755c /activesupport
parent36a301a90aaea213caa54cf3825d3fc9b345c04e (diff)
downloadrails-9fbfb4bffe72320cc895e2f4eb4e30e108d58bb2.tar.gz
rails-9fbfb4bffe72320cc895e2f4eb4e30e108d58bb2.tar.bz2
rails-9fbfb4bffe72320cc895e2f4eb4e30e108d58bb2.zip
Remove dependency on `from_now` extension.
[ Assain Jaleel & Kasper Timm Hansen ]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/messages/metadata.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/messages/metadata.rb b/activesupport/lib/active_support/messages/metadata.rb
index e35086fb77..54678b9552 100644
--- a/activesupport/lib/active_support/messages/metadata.rb
+++ b/activesupport/lib/active_support/messages/metadata.rb
@@ -32,7 +32,7 @@ module ActiveSupport
if expires_at
expires_at.utc.iso8601(3)
elsif expires_in
- expires_in.from_now.utc.iso8601(3)
+ Time.now.utc.advance(seconds: expires_in).iso8601(3)
end
end