From 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 23 Jan 2020 21:08:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/vue_merge_request_widget/index.js | 2 ++ .../vue_merge_request_widget/mr_widget_options.vue | 14 +++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'app/assets/javascripts/vue_merge_request_widget') diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 0cedbdbdfef..7a9ef7e496e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -5,6 +5,8 @@ import Translate from '../vue_shared/translate'; Vue.use(Translate); export default () => { + if (gl.mrWidget) return; + gl.mrWidgetData.gitlabLogo = gon.gitlab_logo; const vm = new Vue(MrWidgetOptions); diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 38a7c262b3e..a18da7386f6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -135,15 +135,11 @@ export default { }, }, mounted() { - if (gon && gon.features && gon.features.asyncMrWidget) { - MRWidgetService.fetchInitialData() - .then(({ data }) => this.initWidget(data)) - .catch(() => - createFlash(__('Unable to load the merge request widget. Try reloading the page.')), - ); - } else { - this.initWidget(); - } + MRWidgetService.fetchInitialData() + .then(({ data }) => this.initWidget(data)) + .catch(() => + createFlash(__('Unable to load the merge request widget. Try reloading the page.')), + ); }, beforeDestroy() { eventHub.$off('mr.discussion.updated', this.checkStatus); -- cgit v1.2.1