diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-24 15:55:02 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-25 19:21:13 +0300 |
| commit | 7d08c7fd1e144cc31aeae12d49f8074e5cfa9ab1 (patch) | |
| tree | fd90239a57ae3d5783bf746121886ba8a1f45483 /app/models/concerns | |
| parent | bfe94698a7e82bf4a5976c8341e28cfcc90bf1de (diff) | |
Merge branch '21513-fix-branch-protection-api' into 'master'
Fix branch protection API.
- Fixes the branch protection API.
- Closes #21513
- EE Merge Request: gitlab-org/gitlab-ee!718
See merge request !6215
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/protected_branch_access.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/concerns/protected_branch_access.rb b/app/models/concerns/protected_branch_access.rb index 5a7b36070e7..7fd0905ee81 100644 --- a/app/models/concerns/protected_branch_access.rb +++ b/app/models/concerns/protected_branch_access.rb @@ -1,6 +1,11 @@ module ProtectedBranchAccess extend ActiveSupport::Concern + included do + scope :master, -> { where(access_level: Gitlab::Access::MASTER) } + scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) } + end + def humanize self.class.human_access_levels[self.access_level] end |