Merge branch 'pull/3472'

[rails.git] / app / models / user_token.rb

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index 844357d8d0242000db462047ea6be54bd01342c1..f927563a948694b80197a2cdf1523f9f9ec126e4 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -18,13 +18,13 @@
 #  user_tokens_user_id_fkey  (user_id => users.id)
 #
 
-class UserToken < ActiveRecord::Base
+class UserToken < ApplicationRecord
   belongs_to :user
 
   after_initialize :set_defaults
 
   def expired?
-    expiry < Time.now
+    expiry < Time.now.utc
   end
 
   private