summaryrefslogtreecommitdiff
path: root/app/models/notification_setting.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 03:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 03:08:47 +0000
commitcfbaef3f1c28cdb9b15615215b87167181cb210f (patch)
tree8713f67e889a9b6d89fd35584ec7405f5a379565 /app/models/notification_setting.rb
parenta97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 (diff)
downloadgitlab-ce-cfbaef3f1c28cdb9b15615215b87167181cb210f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/notification_setting.rb')
-rw-r--r--app/models/notification_setting.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/notification_setting.rb b/app/models/notification_setting.rb
index 1447f822513..e2c362538eb 100644
--- a/app/models/notification_setting.rb
+++ b/app/models/notification_setting.rb
@@ -27,6 +27,8 @@ class NotificationSetting < ApplicationRecord
.where.not(projects: { pending_delete: true })
end
+ scope :preload_source_route, -> { preload(source: [:route]) }
+
EMAIL_EVENTS = [
:new_release,
:new_note,