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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 741aa335aca9c2f2375cb09bbe0093912e07115e..5b91bbda91badfe4f4242c9fc6a5a563b4cdcd19 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -12,8 +12,6 @@
 #
 
 class UserPreference < ApplicationRecord
-  self.primary_keys = "user_id", "k"
-
   belongs_to :user
 
   validates :user, :associated => true