Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 31 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
index 42b3e5364b7..1455847277e 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
@@ -39,27 +39,22 @@ module QA
       private
 
       def set_up_jira_integration
-        # Retry is required because allow_local_requests_from_web_hooks_and_services
-        # takes some time to get enabled.
-        # Bug issue: https://gitlab.com/gitlab-org/gitlab/-/issues/217010
-        QA::Support::Retrier.retry_on_exception(max_attempts: 5, sleep_interval: 3) do
-          Runtime::ApplicationSettings.set_application_settings(allow_local_requests_from_web_hooks_and_services: true)
+        Runtime::ApplicationSettings.set_application_settings(allow_local_requests_from_web_hooks_and_services: true)
 
-          page.visit Runtime::Scenario.gitlab_address
-          Flow::Login.sign_in_unless_signed_in
+        page.visit Runtime::Scenario.gitlab_address
+        Flow::Login.sign_in_unless_signed_in
 
-          project.visit!
+        project.visit!
 
-          Page::Project::Menu.perform(&:go_to_integrations_settings)
-          QA::Page::Project::Settings::Integrations.perform(&:click_jira_link)
+        Page::Project::Menu.perform(&:go_to_integrations_settings)
+        QA::Page::Project::Settings::Integrations.perform(&:click_jira_link)
 
-          QA::Page::Project::Settings::Services::Jira.perform do |jira|
-            jira.setup_service_with(url: Vendor::Jira::JiraAPI.perform(&:base_url))
-          end
-
-          expect(page).not_to have_text("Url is blocked")
-          expect(page).to have_text("Jira settings saved and active.")
+        QA::Page::Project::Settings::Services::Jira.perform do |jira|
+          jira.setup_service_with(url: Vendor::Jira::JiraAPI.perform(&:base_url))
         end
+
+        expect(page).not_to have_text("Url is blocked")
+        expect(page).to have_text("Jira settings saved and active.")
       end
 
       def import_jira_issues
diff --git a/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb b/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
index d53e7fcf69a..449795f9707 100644
--- a/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
@@ -19,26 +19,21 @@ module QA
           page.has_text? 'Welcome to Jira'
         end
 
-        # Retry is required because allow_local_requests_from_web_hooks_and_services
-        # takes some time to get enabled.
-        # Bug issue: https://gitlab.com/gitlab-org/gitlab/-/issues/217010
-        QA::Support::Retrier.retry_on_exception(max_attempts: 5, sleep_interval: 3) do
-          Runtime::ApplicationSettings.set_application_settings(allow_local_requests_from_web_hooks_and_services: true)
+        Runtime::ApplicationSettings.set_application_settings(allow_local_requests_from_web_hooks_and_services: true)
 
-          page.visit Runtime::Scenario.gitlab_address
-          Flow::Login.sign_in_unless_signed_in
+        page.visit Runtime::Scenario.gitlab_address
+        Flow::Login.sign_in_unless_signed_in
 
-          project.visit!
+        project.visit!
 
-          Page::Project::Menu.perform(&:go_to_integrations_settings)
-          QA::Page::Project::Settings::Integrations.perform(&:click_jira_link)
+        Page::Project::Menu.perform(&:go_to_integrations_settings)
+        QA::Page::Project::Settings::Integrations.perform(&:click_jira_link)
 
-          QA::Page::Project::Settings::Services::Jira.perform do |jira|
-            jira.setup_service_with(url: Vendor::Jira::JiraAPI.perform(&:base_url))
-          end
-
-          expect(page).not_to have_text("Requests to the local network are not allowed")
+        QA::Page::Project::Settings::Services::Jira.perform do |jira|
+          jira.setup_service_with(url: Vendor::Jira::JiraAPI.perform(&:base_url))
         end
+
+        expect(page).not_to have_text("Requests to the local network are not allowed")
       end
 
       it 'closes an issue via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/827' do