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

[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..ed6de79e45de20ff7fcbc648b845a9c0f12fe652 100644 (file)
--- a/app/models/diary_entry_subscription.rb
+++ b/app/models/diary_entry_subscription.rb
@@ -15,7 +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
+class DiaryEntrySubscription < ApplicationRecord

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