Moved default_branch_protected? out of Project

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index eca8d5e0f7d..0f0ac18b1a3 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -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