diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2019-04-22 06:25:01 +0300 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2019-04-22 06:25:01 +0300 |
| commit | 42c631b1179bbced98a2b47dc78f145cee6697bd (patch) | |
| tree | 8aa3cf1e3f03d8429b690efd8b8bdb3a4102e511 /lib/gitlab/checks | |
| parent | 10bf3bbc904c96d5d7633f58cb93cf6927e18c8e (diff) | |
Remove protected_branch_creation feature flag
Diffstat (limited to 'lib/gitlab/checks')
| -rw-r--r-- | lib/gitlab/checks/branch_check.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/checks/branch_check.rb b/lib/gitlab/checks/branch_check.rb index 1dbd564fb6f..4ddc1c718c7 100644 --- a/lib/gitlab/checks/branch_check.rb +++ b/lib/gitlab/checks/branch_check.rb @@ -48,7 +48,7 @@ module Gitlab if project.empty_repo? protected_branch_push_checks - elsif creation? && protected_branch_creation_enabled? + elsif creation? protected_branch_creation_checks elsif deletion? protected_branch_deletion_checks @@ -124,10 +124,6 @@ module Gitlab Gitlab::Routing.url_helpers.project_project_members_url(project) end - def protected_branch_creation_enabled? - Feature.enabled?(:protected_branch_creation, project, default_enabled: true) - end - def matching_merge_request? Checks::MatchingMergeRequest.new(newrev, branch_name, project).match? end |