Merge branch...

Merge branch 'quarantine-flaky-tests-spec-features-merge_request-user_sees_diff_spec-rb-49' into 'master' 

Quarantine a flaky test

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



Merged-by: Marc Shaw <mshaw@gitlab.com>
Approved-by: Marc Shaw <mshaw@gitlab.com>
Co-authored-by: Jay McCure <jmccure@gitlab.com>
Co-authored-by: Auto-quarantining bot <gitlab-auto-quarantine-bot@gitlab.com>

spec/features/merge_request/user_sees_diff_spec.rb

@@ -47,7 +47,7 @@
       visit "#{diffs_project_merge_request_path(project, merge_request)}##{line_code}"
     end
 
-    it 'shows the linked line' do
+    it 'shows the linked line', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/496702' do
       expect(page).to have_selector("[id='#{line_code}']", visible: true, obscured: false)
     end
   end