diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
| commit | 2047991363844b4f17216f94778b432ed198a412 (patch) | |
| tree | 6b90710c44dae00178ad323d796beb59737f47f1 /app/models/subscription.rb | |
| parent | 7a1c5ba7471b233c994f5b5b313085d0d1292b5d (diff) | |
| parent | f3203cbbc25586df622552153cc460d2f79f414e (diff) | |
| download | gitlab-ce-2047991363844b4f17216f94778b432ed198a412.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/models/subscription.rb')
| -rw-r--r-- | app/models/subscription.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/subscription.rb b/app/models/subscription.rb index 17869c8bac2..2f0c9640744 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -1,7 +1,7 @@ class Subscription < ActiveRecord::Base belongs_to :user belongs_to :project - belongs_to :subscribable, polymorphic: true + belongs_to :subscribable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations validates :user, :subscribable, presence: true |