Merge branch 'iamphill-master-patch-62335' into 'master'

Quarantine flaky test in user_suggests_changes_on_diff_spec

See merge request gitlab-org/gitlab!22098

spec/features/merge_request/user_suggests_changes_on_diff_spec.rb

@@ -97,7 +97,8 @@ describe 'User comments on a diff', :js do
   end
 
   context 'multiple suggestions in expanded lines' do
-    it 'suggestions are appliable' do
+    # https://gitlab.com/gitlab-org/gitlab/issues/38277
+    it 'suggestions are appliable', :quarantine do
       diff_file = merge_request.diffs(paths: ['files/ruby/popen.rb']).diff_files.first
       hash = Digest::SHA1.hexdigest(diff_file.file_path)