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 8c313bc927322ba5ea7e9845fe8d60e026c8d902..0000000000000000000000000000000000000000 --- 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 1de79de3acb73a7a6f034893a8d99846bf421de8..43f3198e783395c84421558ef611426fdc0d8116 100644 --- a/ee/app/models/ee/project.rb +++ b/ee/app/models/ee/project.rb @@ -981,8 +981,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 91bc80238b4d23fe256d0a10efcd4279d6dd9914..7685bd6c4e499955d605f234c32742924b7304fb 100644 --- a/ee/spec/models/project_spec.rb +++ b/ee/spec/models/project_spec.rb @@ -2738,15 +2738,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"