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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 37bab38b0ccb7c6f5ff481e0efc234a01aa18d2d..d5cad3978c81f087cacee2b13f3e152aa87df506 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -11,7 +11,7 @@
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 

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

   self.primary_keys = "user_id", "k"
 
   belongs_to :user
   self.primary_keys = "user_id", "k"
 
   belongs_to :user