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

[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 6e9a103adafac0d1315ecd1e956ff32cfc0abc2e..93b8847f433f655ee673ad339053f5dd460ec126 100644 (file)
--- a/app/models/diary_entry_subscription.rb
+++ b/app/models/diary_entry_subscription.rb
@@ -15,9 +15,7 @@
 #  diary_entry_subscriptions_user_id_fkey         (user_id => users.id)
 #
 
 #  diary_entry_subscriptions_user_id_fkey         (user_id => users.id)
 #
 

-class DiaryEntrySubscription < ActiveRecord::Base
-  self.primary_keys = "user_id", "diary_entry_id"
-
+class DiaryEntrySubscription < ApplicationRecord

   belongs_to :user
   belongs_to :diary_entry
 end
   belongs_to :user
   belongs_to :diary_entry
 end