summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-04 17:19:41 +0100
committerPhil Hughes <me@iamphill.com>2017-05-04 17:19:41 +0100
commit58e36044397b7fad093dfaea0dc385e3d9ce2f06 (patch)
tree6ee0654c55f3075243fbdf184fdb3307b3f033c8
parent985737fdcf9b79dadfb72d0c9ed9abf4464559f8 (diff)
downloadgitlab-ce-merge-request-poll-json-endpoint.tar.gz
Fixed bug where merge request JSON would showmerge-request-poll-json-endpoint
Closes #28909
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
-rw-r--r--changelogs/unreleased/merge-request-poll-json-endpoint.yml4
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: