summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-18 11:28:02 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-18 11:28:02 +0000
commit3870a1bde276144a05a31185ede7a5032818d489 (patch)
tree0e8d69c1859be1d59de6a2edd1abf599d3618948 /app/views/projects/merge_requests
parentc20720cf84132d7bf14763aba0570bd8882f9c6d (diff)
parentcba40a1f551e4c1b46bfa49a709f59feb59782bd (diff)
downloadgitlab-ce-3870a1bde276144a05a31185ede7a5032818d489.tar.gz
Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'
Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index abff702fd9d..8740c6895df 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -20,7 +20,7 @@
-# haml-lint:disable InlineJavaScript
:javascript
window.gl = window.gl || {};
- window.gl.mrWidgetData = #{serialize_issuable(@merge_request)}
+ window.gl.mrWidgetData = #{serialize_issuable(@merge_request, serializer: 'widget')}
#js-vue-mr-widget.mr-widget