Merge remote-tracking branch 'upstream/pull/3187'

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

diff --git a/app/models/user_token.rb b/app/models/user_token.rb
index 0d1e16e8acead524674dbca9aafb58398fe6cb14..8c9bf4aeb36de68479d11533e406f9106877da4b 100644 (file)
--- a/app/models/user_token.rb
+++ b/app/models/user_token.rb
@@ -2,8 +2,8 @@
 #
 # Table name: user_tokens
 #
 #
 # Table name: user_tokens
 #

-#  id      :integer          not null, primary key
-#  user_id :integer          not null
+#  id      :bigint(8)        not null, primary key
+#  user_id :bigint(8)        not null

 #  token   :string           not null
 #  expiry  :datetime         not null
 #  referer :text
 #  token   :string           not null
 #  expiry  :datetime         not null
 #  referer :text


@@ -18,7 +18,7 @@
 #  user_tokens_user_id_fkey  (user_id => users.id)
 #
 
 #  user_tokens_user_id_fkey  (user_id => users.id)
 #
 

-class UserToken < ActiveRecord::Base
+class UserToken < ApplicationRecord

   belongs_to :user
 
   after_initialize :set_defaults
   belongs_to :user
 
   after_initialize :set_defaults