From 42c631b1179bbced98a2b47dc78f145cee6697bd Mon Sep 17 00:00:00 2001 From: Patrick Bajao Date: Mon, 22 Apr 2019 11:25:01 +0800 Subject: Remove protected_branch_creation feature flag --- lib/gitlab/checks/branch_check.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/gitlab/checks') 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 -- cgit v1.2.1