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

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

diff --git a/app/models/diary_entry_subscription.rb b/app/models/diary_entry_subscription.rb
index ed6de79e45de20ff7fcbc648b845a9c0f12fe652..93b8847f433f655ee673ad339053f5dd460ec126 100644 (file)
--- a/app/models/diary_entry_subscription.rb
+++ b/app/models/diary_entry_subscription.rb
@@ -16,8 +16,6 @@
 #
 
 class DiaryEntrySubscription < ApplicationRecord
-  self.primary_keys = "user_id", "diary_entry_id"
-
   belongs_to :user
   belongs_to :diary_entry
 end