Merge branch 'merge-requests' into 'master'

Fix duplicate spec in merge requests

See merge request gitlab-org/gitlab!28856

.rubocop.yml

@@ -392,7 +392,6 @@ RSpec/RepeatedExample:
     - 'spec/features/merge_request/user_posts_diff_notes_spec.rb'
     - 'spec/features/projects/files/template_type_dropdown_spec.rb'
     - 'spec/finders/environments_finder_spec.rb'
-    - 'spec/frontend/fixtures/merge_requests.rb'
     - 'spec/helpers/users_helper_spec.rb'
     - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb'
     - 'spec/services/notification_service_spec.rb'

changelogs/unreleased/merge-requests.yml

+---
+title: Fix duplciate spec in merge requests
+merge_request: 28856
+author: Rajendra Kadam
+type: added

spec/frontend/fixtures/merge_requests.rb

@@ -94,7 +94,7 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
   end
 
   it 'merge_requests/discussions.json' do
-    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
+    create(:discussion_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
     render_discussions_json(merge_request)
   end