Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-18 14:28:02 +0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2017-12-19 19:04:45 +0300
commit268f4848486763e80fb09511c050e02411926dea (patch)
tree51db2a7f85e7466b05ab16925c6df034329483ff /app/views
parent17b9d86ad7d594e169441c7be490b398cfa9e725 (diff)
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 (cherry picked from commit 3870a1bde276144a05a31185ede7a5032818d489) cba40a1f Stop sending milestone and labels data over the wire for MR widget
Diffstat (limited to 'app/views')
-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