Commit 50fc589c authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'ph/241784/discussionsStartupApiCall' into 'master'

Added discussions.json API call to startup JS

See merge request gitlab-org/gitlab!48119
parents a23ede4b f415f867
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
= render "projects/merge_requests/description" = render "projects/merge_requests/description"
= render "projects/merge_requests/widget" = render "projects/merge_requests/widget"
= render "projects/merge_requests/awards_block" = render "projects/merge_requests/awards_block"
- if mr_action === "show"
- add_page_startup_api_call discussions_path(@merge_request)
#js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json, #js-vue-mr-discussions{ data: { notes_data: notes_data(@merge_request).to_json,
noteable_data: serialize_issuable(@merge_request, serializer: 'noteable'), noteable_data: serialize_issuable(@merge_request, serializer: 'noteable'),
noteable_type: 'MergeRequest', noteable_type: 'MergeRequest',
......
...@@ -31,7 +31,8 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue', ...@@ -31,7 +31,8 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
end end
it 'does not show a link to create a new issue' do # https://gitlab.com/gitlab-org/gitlab/-/issues/285453
xit 'does not show a link to create a new issue' do
expect(page).not_to have_css resolve_discussion_selector expect(page).not_to have_css resolve_discussion_selector
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment