diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 12:09:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-06 12:09:17 +0300 |
| commit | eaea945e0355826c58c3dcf887496ea91064f85c (patch) | |
| tree | 0f20e03304d35e68375e99a606b9b94483e37ee5 /spec/frontend/fixtures/merge_requests.rb | |
| parent | cce8cf03d3bebe8b05375e4db0004328f84b28a2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures/merge_requests.rb')
| -rw-r--r-- | spec/frontend/fixtures/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb index be11423ec41..a347ef683e7 100644 --- a/spec/frontend/fixtures/merge_requests.rb +++ b/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 |