diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-29 18:09:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-29 18:09:30 +0300 |
commit | 09ff71d425b83646eed07d52078111ccbd4b84a9 (patch) | |
tree | 836e655ab4bd9fc680a35ab9e4a176134a2c9221 /app/models/protected_branch.rb | |
parent | 1838e244070041ed8ebb6344c628b580d78b578f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/protected_branch.rb')
-rw-r--r-- | app/models/protected_branch.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index cbbdd091feb..963a6b7774a 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -30,7 +30,7 @@ class ProtectedBranch < ApplicationRecord end def self.allow_force_push?(project, ref_name) - return false unless ::Feature.enabled?(:allow_force_push_to_protected_branches, project) + return false unless ::Feature.enabled?(:allow_force_push_to_protected_branches, project, default_enabled: :yaml) project.protected_branches.allowing_force_push.matching(ref_name).any? end |