Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 1 deletions

diff --git a/qa/qa/page/group/settings/general.rb b/qa/qa/page/group/settings/general.rb
index efc8bbd7482..4a30403fda8 100644
--- a/qa/qa/page/group/settings/general.rb
+++ b/qa/qa/page/group/settings/general.rb
@@ -94,6 +94,18 @@ module QA
             select_element(:project_creation_level_dropdown, value)
             click_element :save_permissions_changes_button
           end
+
+          def toggle_request_access
+            expand_section :permission_lfs_2fa_section
+
+            if find_element(:request_access_checkbox).checked?
+              uncheck_element :request_access_checkbox
+            else
+              check_element :request_access_checkbox
+            end
+
+            click_element :save_permissions_changes_button
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
index a118176eb8a..70303a30153 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :orchestrated, :oauth do
+  context 'Manage', :orchestrated, :oauth, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196517' do
     describe 'OAuth login' do
       it 'User logs in to GitLab with GitHub OAuth' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)