diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 09:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 09:06:14 +0000 |
commit | 7801d133b6c33917a3a151c7a8db5243b148a487 (patch) | |
tree | 7a8fbb7dd66875acd0adb490dc91aa91c0802987 /app/models/concerns/protected_ref.rb | |
parent | 60877d1bff65fa4d2b74409d343d5b7615478891 (diff) | |
download | gitlab-ce-7801d133b6c33917a3a151c7a8db5243b148a487.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/protected_ref.rb')
-rw-r--r-- | app/models/concerns/protected_ref.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb index ebacc459cb5..d9a7f0a96dc 100644 --- a/app/models/concerns/protected_ref.rb +++ b/app/models/concerns/protected_ref.rb @@ -39,8 +39,8 @@ module ProtectedRef end end - def developers_can?(action, ref) - access_levels_for_ref(ref, action: action).any? do |access_level| + def developers_can?(action, ref, protected_refs: nil) + access_levels_for_ref(ref, action: action, protected_refs: protected_refs).any? do |access_level| access_level.access_level == Gitlab::Access::DEVELOPER end end |