diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-02 16:58:28 -0700 |
| commit | 408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea (patch) | |
| tree | 708ae61f9683b48f436f7577d1fad98f30e100fc /app/models/notification_setting.rb | |
| parent | 3f81586ef0ab20533b8da1213bd9f60e1786dbaa (diff) | |
| parent | faa2a123911eaf84bb57163ea7af759d4632601b (diff) | |
| download | gitlab-ce-408df2edcbd5f3f93ef5541bac9de2b71ba4f0ea.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'app/models/notification_setting.rb')
| -rw-r--r-- | app/models/notification_setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb index b0df7aeb323..81844b1e2ca 100644 --- a/app/models/notification_setting.rb +++ b/app/models/notification_setting.rb @@ -19,7 +19,7 @@ class NotificationSetting < ActiveRecord::Base # pending delete). # scope :for_projects, -> do - includes(:project).references(:projects).where(source_type: 'Project').where.not(projects: { id: nil }) + includes(:project).references(:projects).where(source_type: 'Project').where.not(projects: { id: nil, pending_delete: true }) end EMAIL_EVENTS = [ |