summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-08-21 14:47:04 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-21 14:47:04 +0000
commitb7e6c898c7449eb48744b7312dbfa6baa92a00d6 (patch)
tree60cea18915f06cc3331c386a013e56ef3191c6eb /app/assets
parentef0f1509dd2a2a3ba5798362e2be21108b705a85 (diff)
downloadgitlab-ce-b7e6c898c7449eb48744b7312dbfa6baa92a00d6.tar.gz
Resolve "HTML code shown in merge request"
- Fixes double escaped text in `mr_widget_rebase.vue`
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index c7b064b8506..339e154affc 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -50,6 +50,7 @@ export default {
startTag: '<span class="label-branch">',
endTag: '</span>',
},
+ false,
);
},
},