rename table subscribe; make it polymorfic

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index c74d9cb9917..d1a35ca5294 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -15,7 +15,7 @@ module Issuable
     has_many :notes, as: :noteable, dependent: :destroy
     has_many :label_links, as: :target, dependent: :destroy
     has_many :labels, through: :label_links
-    has_many :subscribes, dependent: :destroy
+    has_many :subscriptions, dependent: :destroy, as: :subscribable
 
     validates :author, presence: true
     validates :title, presence: true, length: { within: 0..255 }
@@ -133,10 +133,11 @@ module Issuable
     users.concat(mentions.reduce([], :|)).uniq
   end
 
-  def subscribe_status(user)
-    subscribe = subscribes.find_by_user_id(user.id)
-    if subscribe
-      return subscribe.subscribed
+  def subscription_status(user)
+    subscription = subscriptions.find_by_user_id(user.id)
+
+    if subscription
+      return subscription.subscribed
     end
 
     participants.include?(user)