Merge branch 'protected-branches-names' into 'master'

Only load branch names for protected branch checks

See merge request gitlab-org/gitlab-ce!15629
This commit is contained in:
Douwe Maan 2017-11-30 09:06:14 +00:00
commit 1aaa6095a2
3 changed files with 11 additions and 2 deletions

View File

@ -10,7 +10,9 @@ class ProtectedBranch < ActiveRecord::Base
def self.protected?(project, ref_name)
return true if project.empty_repo? && default_branch_protected?
self.matching(ref_name, protected_refs: project.protected_branches).present?
refs = project.protected_branches.select(:name)
self.matching(ref_name, protected_refs: refs).present?
end
def self.default_branch_protected?

View File

@ -5,6 +5,8 @@ class ProtectedTag < ActiveRecord::Base
protected_ref_access_levels :create
def self.protected?(project, ref_name)
self.matching(ref_name, protected_refs: project.protected_tags).present?
refs = project.protected_tags.select(:name)
self.matching(ref_name, protected_refs: refs).present?
end
end

View File

@ -0,0 +1,5 @@
---
title: Only load branch names for protected branch checks
merge_request:
author:
type: performance