Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 7 insertions, 8 deletions

diff --git a/spec/requests/projects/merge_requests_controller_spec.rb b/spec/requests/projects/merge_requests_controller_spec.rb
index 6580fc8b80f..2ee86bb423b 100644
--- a/spec/requests/projects/merge_requests_controller_spec.rb
+++ b/spec/requests/projects/merge_requests_controller_spec.rb
@@ -29,11 +29,12 @@ RSpec.describe Projects::MergeRequestsController do
         notes = discussions.flat_map { |d| d['notes'] }
 
         expect(discussions.count).to eq(2)
-        expect(notes).to match([
-          a_hash_including('id' => discussion.id.to_s),
-          a_hash_including('id' => discussion_reply.id.to_s),
-          a_hash_including('type' => 'StateNote')
-        ])
+        expect(notes).to match(
+          [
+            a_hash_including('id' => discussion.id.to_s),
+            a_hash_including('id' => discussion_reply.id.to_s),
+            a_hash_including('type' => 'StateNote')
+          ])
 
         cursor = response.header['X-Next-Page-Cursor']
         expect(cursor).to be_present
@@ -44,9 +45,7 @@ RSpec.describe Projects::MergeRequestsController do
         notes = discussions.flat_map { |d| d['notes'] }
 
         expect(discussions.count).to eq(1)
-        expect(notes).to match([
-          a_hash_including('id' => discussion_2.id.to_s)
-        ])
+        expect(notes).to match([a_hash_including('id' => discussion_2.id.to_s)])
       end
 
       context 'when paginated_mr_discussions is disabled' do