From f165783d139ecc5245d2ed20418ab035298bb63e Mon Sep 17 00:00:00 2001
From: Robert May <rmay@gitlab.com>
Date: Mon, 14 Feb 2022 14:08:55 +0000
Subject: [PATCH] Block external fork mirrors
Changelog: fixed
---
.../development/block_external_fork_network_mirrors.yml | 8 --------
ee/app/models/ee/project.rb | 2 --
ee/spec/models/project_spec.rb | 9 ---------
3 files changed, 19 deletions(-)
delete mode 100644 config/feature_flags/development/block_external_fork_network_mirrors.yml
diff --git a/config/feature_flags/development/block_external_fork_network_mirrors.yml b/config/feature_flags/development/block_external_fork_network_mirrors.yml
deleted file mode 100644
index 8c313bc92732..000000000000
--- a/config/feature_flags/development/block_external_fork_network_mirrors.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: block_external_fork_network_mirrors
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60735
-rollout_issue_url:
-milestone: '14.0'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index 2c31480ae531..929bb9409a83 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -975,8 +975,6 @@ def latest_not_ingested_security_pipeline(only_successful)
# If the project is inside a fork network, the mirror URL must
# also belong to a member of that fork network
def import_url_inside_fork_network
- return unless ::Feature.enabled?(:block_external_fork_network_mirrors, self, default_enabled: :yaml)
-
if forked?
mirror_project = ::Project.find_by_url(import_url)
diff --git a/ee/spec/models/project_spec.rb b/ee/spec/models/project_spec.rb
index f6cf95ab2a9d..a07b12d7c0fa 100644
--- a/ee/spec/models/project_spec.rb
+++ b/ee/spec/models/project_spec.rb
@@ -2709,15 +2709,6 @@
stub_config_setting(host: 'gitlab.com')
end
- context 'feature flag is disabled' do
- before do
- stub_feature_flags(block_external_fork_network_mirrors: false)
- project.import_url = "https://customgitlab.com/foo/bar.git"
- end
-
- it { is_expected.to be_valid }
- end
-
context 'the project is the root of the fork network' do
before do
project.import_url = "https://customgitlab.com/foo/bar.git"
--
GitLab