diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-05 09:16:44 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-05 09:16:44 +0000 |
| commit | 07eac529fc0ec30ff6bea2bba01c68b72fee4f14 (patch) | |
| tree | 19666e756c5ea3e279a48f82aedcf6cfb8e88d19 | |
| parent | 8b336ae124408566116c36d198264c9175bcbe9b (diff) | |
| parent | 58e36044397b7fad093dfaea0dc385e3d9ce2f06 (diff) | |
| download | gitlab-ce-07eac529fc0ec30ff6bea2bba01c68b72fee4f14.tar.gz | |
Merge branch 'merge-request-poll-json-endpoint' into 'master'
Fixed bug where merge request JSON would show
Closes #28909
See merge request !11096
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/merge-request-poll-json-endpoint.yml | 4 |
2 files changed, 5 insertions, 1 deletions
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: |