summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-07-20 23:07:35 +0000
committerRobert Speicher <robert@gitlab.com>2018-07-20 23:07:35 +0000
commit4271f448c85f6a3dc50728a4b77d7d57474bac6f (patch)
tree2500b7f7741373568d00d8195874e2bc7fce9d33 /app/models
parent334ee10727540c8e16d47075781564fd21e8a9cb (diff)
parent444b54ee38f9dfbc88ee9f99533832ef0ddce600 (diff)
downloadgitlab-ce-4271f448c85f6a3dc50728a4b77d7d57474bac6f.tar.gz
Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master'
[CE] Resolve "Extract EE specific files/lines for some platform related project views" See merge request gitlab-org/gitlab-ce!19859
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/protected_ref_access.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
index 71b0c3468b9..5ff7b41b82b 100644
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -17,6 +17,11 @@ module ProtectedRefAccess
scope :master, -> { maintainer } # @deprecated
scope :maintainer, -> { where(access_level: Gitlab::Access::MAINTAINER) }
scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+ scope :by_user, -> (user) { where(user_id: user ) }
+ scope :by_group, -> (group) { where(group_id: group ) }
+ scope :for_role, -> { where(user_id: nil, group_id: nil) }
+ scope :for_user, -> { where.not(user_id: nil) }
+ scope :for_group, -> { where.not(group_id: nil) }
validates :access_level, presence: true, if: :role?, inclusion: {
in: ALLOWED_ACCESS_LEVELS