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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 37bab38b0ccb7c6f5ff481e0efc234a01aa18d2d..5b91bbda91badfe4f4242c9fc6a5a563b4cdcd19 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -11,11 +11,9 @@
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 
-class UserPreference < ActiveRecord::Base
-  self.primary_keys = "user_id", "k"
-
+class UserPreference < ApplicationRecord
   belongs_to :user
 
-  validates :user, :presence => true, :associated => true
+  validates :user, :associated => true
   validates :k, :v, :length => 1..255, :characters => true
 end