Merge branch...

Merge branch '276012-flaky-test-spec-features-merge_request-user_resolves_diff_notes_and_discussions_resolve_spec' into 'master'

test: Remove useless and flaky expectation in MR diff note test

See merge request gitlab-org/gitlab!48599

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -111,7 +111,6 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
           it 'shows resolved thread when toggled' do
             find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click
 
-            expect(page.find(".line-holder-placeholder")).to be_visible
             expect(page.find(".timeline-content #note_#{note.id}")).to be_visible
           end