Merge branch '429293-remove-ff' into 'master'

Remove increase_jira_import_issues_timeout feature flag

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141791



Merged-by: Aaron Huntsman <ahuntsman@gitlab.com>
Approved-by: Gavin Hinfey <ghinfey@gitlab.com>
Approved-by: Aaron Huntsman <ahuntsman@gitlab.com>
Co-authored-by: Mario Celi <mcelicalderon@gitlab.com>

app/workers/gitlab/jira_import/stage/import_issues_worker.rb

@@ -9,13 +9,9 @@ class ImportIssuesWorker # rubocop:disable Scalability/IdempotentWorker
         private
 
         def import(project)
-          jira_client = if Feature.enabled?(:increase_jira_import_issues_timeout)
-                          project.jira_integration.client(read_timeout: 2.minutes)
-                        end
-
           jobs_waiter = Gitlab::JiraImport::IssuesImporter.new(
             project,
-            jira_client
+            project.jira_integration.client(read_timeout: 2.minutes)
           ).execute
 
           project.latest_jira_import.refresh_jid_expiration

config/feature_flags/development/increase_jira_import_issues_timeout.yml

----
-name: increase_jira_import_issues_timeout
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135050
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429293
-milestone: '16.6'
-type: development
-group: group::project management
-default_enabled: true

spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb

@@ -55,23 +55,6 @@
         described_class.new.perform(project.id)
       end
 
-      context 'when increase_jira_import_issues_timeout feature flag is disabled' do
-        before do
-          stub_feature_flags(increase_jira_import_issues_timeout: false)
-        end
-
-        it 'does not provide a custom client to IssuesImporter' do
-          issue_importer = instance_double(Gitlab::JiraImport::IssuesImporter)
-          expect(Gitlab::JiraImport::IssuesImporter).to receive(:new).with(
-            instance_of(Project),
-            nil
-          ).and_return(issue_importer)
-          allow(issue_importer).to receive(:execute).and_return(job_waiter)
-
-          described_class.new.perform(project.id)
-        end
-      end
-
       context 'when start_at is nil' do
         it_behaves_like 'advance to next stage', :attachments
       end