Merge branch 'remove-feature-flag-import-graceful-failures' into 'master'

Remove feature flag for import graceful failures

See merge request gitlab-org/gitlab!22707

changelogs/unreleased/remove-feature-flag-import-graceful-failures.yml

+---
+title: Remove feature flag for import graceful failures
+merge_request:
+author:
+type: other

lib/gitlab/import_export/relation_tree_restorer.rb

@@ -75,9 +75,6 @@ module Gitlab
 
         save_id_mapping(relation_key, data_hash, relation_object)
       rescue => e
-        # re-raise if not enabled
-        raise e unless Feature.enabled?(:import_graceful_failures, @importable.group, default_enabled: true)
-
         log_import_failure(relation_key, relation_index, e)
       end
 

spec/tasks/gitlab/import_export/import_rake_spec.rb

@@ -76,11 +76,6 @@ describe 'gitlab:import_export:import rake task', :sidekiq do
     let(:not_imported_message) { /Total number of not imported relations: 1/ }
     let(:error) { /Validation failed: Notes is invalid/ }
 
-    context 'when import_graceful_failures feature flag is enabled' do
-      before do
-        stub_feature_flags(import_graceful_failures: true)
-      end
-
     it 'performs project import successfully' do
       expect { subject }.to output(not_imported_message).to_stdout
       expect { subject }.not_to raise_error
@@ -90,23 +85,4 @@ describe 'gitlab:import_export:import rake task', :sidekiq do
       expect(project.import_state.status).to eq('finished')
     end
   end
-
-    context 'when import_graceful_failures feature flag is disabled' do
-      before do
-        stub_feature_flags(import_graceful_failures: false)
-      end
-
-      it 'fails project import with an error' do
-        # Catch exit call, and raise exception instead
-        expect_any_instance_of(GitlabProjectImport).to receive(:exit)
-          .with(1).and_raise(SystemExit)
-
-        expect { subject }.to raise_error(SystemExit).and output(error).to_stdout
-
-        expect(project.merge_requests).to be_empty
-        expect(project.import_state.last_error).to match(error)
-        expect(project.import_state.status).to eq('failed')
-      end
-    end
-  end
 end