Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 1 deletions

diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
index fb35970e6dd..a671edb3ceb 100644
--- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j
       end
     end
 
-    context 'creating an issue for threads' do
+    context 'creating an issue for threads', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/420845' do
       before do
         find('.discussions-counter .gl-new-dropdown-toggle').click
         find(resolve_all_discussions_link_selector).click
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index 73a920421a3..52a8f0b105a 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -57,6 +57,8 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
 
     context 'creating the issue' do
       before do
+        allow(Gitlab::QueryLimiting::Transaction).to receive(:threshold).and_return(105)
+
         find(resolve_discussion_selector, match: :first).click
       end