Commit 4f71c29c authored by James Edwards-Jones's avatar James Edwards-Jones
Browse files

Moved default_branch_protected? out of Project

parent a358d7931df1
......@@ -883,11 +883,6 @@ def http_url_to_repo(user = nil)
"#{url}.git"
end
def empty_and_default_branch_protected?
empty_repo? && default_branch_protected?
end
#TODO: Check with if this is still needed, maybe because of `.select {` in ProtectedRefsMatcher
#Either with tests or by asking Tim
def protected_tags_array
......@@ -899,7 +894,7 @@ def protected_branches_array
end
def user_can_push_to_empty_repo?(user)
!default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
!ProtectedBranch.default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
end
def forked?
......@@ -1366,12 +1361,6 @@ def pushes_since_gc_redis_key
"projects/#{id}/pushes_since_gc"
end
#TODO: Move this and methods which depend upon it
def default_branch_protected?
current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_FULL ||
current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
end
# Similar to the normal callbacks that hook into the life cycle of an
# Active Record object, you can also define callbacks that get triggered
# when you add an object to an association collection. If any of these
......
......@@ -13,9 +13,14 @@ class ProtectedBranch < ActiveRecord::Base
# Check if branch name is marked as protected in the system
def self.protected?(project, ref_name)
return true if project.empty_and_default_branch_protected?
return true if project.empty_repo? && default_branch_protected?
protected_refs = project.protected_branches_array
self.matching(ref_name, protected_refs: protected_refs).present?
end
def self.default_branch_protected?
current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_FULL ||
current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment