summaryrefslogtreecommitdiff
path: root/app/models/member.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-17 18:09:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-17 18:09:20 +0000
commitec72da1833d94bb1556af94193ccf2a93c9cb939 (patch)
tree6227669a11aaf8370186a7aa6591d5fa9d853bb0 /app/models/member.rb
parent283fb71e02992b6687e3264d53bbc718b7567109 (diff)
downloadgitlab-ce-ec72da1833d94bb1556af94193ccf2a93c9cb939.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/member.rb')
-rw-r--r--app/models/member.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 36f9741ce01..2c62ea55785 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -86,6 +86,7 @@ class Member < ApplicationRecord
scope :owners, -> { active.where(access_level: OWNER) }
scope :owners_and_maintainers, -> { active.where(access_level: [OWNER, MAINTAINER]) }
scope :with_user, -> (user) { where(user: user) }
+ scope :preload_user_and_notification_settings, -> { preload(user: :notification_settings) }
scope :with_source_id, ->(source_id) { where(source_id: source_id) }
scope :including_source, -> { includes(:source) }