Extract ProtectedRef Concern

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb
index 921159d91ef..5a5a4ebd08b 100644
--- a/lib/gitlab/user_access.rb
+++ b/lib/gitlab/user_access.rb
@@ -35,10 +35,7 @@ module Gitlab
       return false unless can_access_git?
 
       if project.protected_tag?(ref)
-        access_levels = project.protected_tags.matching(ref).map(&:push_access_levels).flatten
-        has_access = access_levels.any? { |access_level| access_level.check_access(user) }
-
-        has_access
+        project.protected_tags.matching_refs_accesible_to(ref, user)
       else
         user.can?(:push_code, project)
       end
@@ -50,8 +47,7 @@ module Gitlab
       if project.protected_branch?(ref)
         return true if project.empty_repo? && project.user_can_push_to_empty_repo?(user)
 
-        access_levels = project.protected_branches.matching(ref).map(&:push_access_levels).flatten
-        has_access = access_levels.any? { |access_level| access_level.check_access(user) }
+        has_access = project.protected_branches.matching_refs_accesible_to(ref, user, action: :push)
 
         has_access || !project.repository.branch_exists?(ref) && can_merge_to_branch?(ref)
       else
@@ -63,8 +59,7 @@ module Gitlab
       return false unless can_access_git?
 
       if project.protected_branch?(ref)
-        access_levels = project.protected_branches.matching(ref).map(&:merge_access_levels).flatten
-        access_levels.any? { |access_level| access_level.check_access(user) }
+        project.protected_branches.matching_refs_accesible_to(ref, user, action: :merge)
       else
         user.can?(:push_code, project)
       end