From 58e36044397b7fad093dfaea0dc385e3d9ce2f06 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 4 May 2017 17:19:41 +0100 Subject: Fixed bug where merge request JSON would show Closes #28909 --- app/views/projects/merge_requests/_show.html.haml | 2 +- changelogs/unreleased/merge-request-poll-json-endpoint.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/merge-request-poll-json-endpoint.yml diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 881ee9fd596..9e306d4543c 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -6,7 +6,7 @@ = page_specific_javascript_bundle_tag('common_vue') = page_specific_javascript_bundle_tag('diff_notes') -.merge-request{ 'data-url' => merge_request_path(@merge_request), 'data-project-path' => project_path(@merge_request.project) } +.merge-request{ 'data-url' => merge_request_path(@merge_request, format: :json), 'data-project-path' => project_path(@merge_request.project) } = render "projects/merge_requests/show/mr_title" .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } } diff --git a/changelogs/unreleased/merge-request-poll-json-endpoint.yml b/changelogs/unreleased/merge-request-poll-json-endpoint.yml new file mode 100644 index 00000000000..6c41984e9b7 --- /dev/null +++ b/changelogs/unreleased/merge-request-poll-json-endpoint.yml @@ -0,0 +1,4 @@ +--- +title: Fixed bug where merge request JSON would be displayed +merge_request: +author: -- cgit v1.2.1