Merge branch 'caalberts-quarantine-flaky-batched-mr-diff' into 'master'

Quarantine flaky spec on batched MR diffs

See merge request gitlab-org/gitlab!50242

spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb

@@ -69,7 +69,8 @@ RSpec.describe 'Batch diffs', :js do
     end
 
     context 'which is in at least page 2 of the batched pages of diffs' do
-      it 'scrolls to the correct discussion' do
+      it 'scrolls to the correct discussion',
+         quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/293814' } do
         page.within('.diff-file.file-holder:last-of-type') do
           click_link('just now')
         end