diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-24 11:31:59 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-11-24 11:31:59 +0000 |
| commit | 79a791a30d60d04be34d0e6d36c9cc145b97635b (patch) | |
| tree | 7495834ed7bdfb51946c5f40fc61f1568ff0f823 /app/models/subscription.rb | |
| parent | fa04393482eff8d7d7cdb71c3bdea2c918a49a57 (diff) | |
| parent | 3e44ed3e2bf75bb14a2d8b0466b3d92afd0ea067 (diff) | |
| download | gitlab-ce-menu-resize-hide.tar.gz | |
Merge branch 'master' into menu-resize-hidemenu-resize-hide
Diffstat (limited to 'app/models/subscription.rb')
| -rw-r--r-- | app/models/subscription.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/subscription.rb b/app/models/subscription.rb index 3b8aa1eb866..17869c8bac2 100644 --- a/app/models/subscription.rb +++ b/app/models/subscription.rb @@ -1,8 +1,9 @@ class Subscription < ActiveRecord::Base belongs_to :user + belongs_to :project belongs_to :subscribable, polymorphic: true - validates :user_id, - uniqueness: { scope: [:subscribable_id, :subscribable_type] }, - presence: true + validates :user, :subscribable, presence: true + + validates :project_id, uniqueness: { scope: [:subscribable_id, :subscribable_type, :user_id] } end |