Merge branch 'sh-fix-issue-20532' into 'master'

Fix flaky spec in user_suggests_changes_on_diff_spec.rb

Closes #38277

See merge request gitlab-org/gitlab!21360

spec/features/merge_request/user_suggests_changes_on_diff_spec.rb

@@ -139,6 +139,10 @@ describe 'User comments on a diff', :js do
       # Making sure it's not a Front-end cache.
       visit(diffs_project_merge_request_path(project, merge_request))
 
+      page.within '.line-resolve-all-container' do
+        page.find('.discussion-next-btn').click
+      end
+
       expect_appliable_suggestions(2)
 
       page.within("[id='#{hash}']") do