Commit 07eac529 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'merge-request-poll-json-endpoint' into 'master'

Fixed bug where merge request JSON would show

Closes #28909

See merge request !11096
parents 8b336ae1 58e36044
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= page_specific_javascript_bundle_tag('common_vue') = page_specific_javascript_bundle_tag('common_vue')
= page_specific_javascript_bundle_tag('diff_notes') = 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" = render "projects/merge_requests/show/mr_title"
.merge-request-details.issuable-details{ data: { id: @merge_request.project.id } } .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
......
---
title: Fixed bug where merge request JSON would be displayed
merge_request:
author:
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