diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-03-31 01:45:48 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-04-03 22:19:38 +0300 |
| commit | 357699fbcc1ef6a0bcdd58bbb1207f9f46ad752c (patch) | |
| tree | 996c74f4941fe84ff912fc60e7fa80835983f5d2 | |
| parent | 7c2930ee664d956b7bda2a404ae85c53207c53dd (diff) | |
| download | gitlab-ce-357699fbcc1ef6a0bcdd58bbb1207f9f46ad752c.tar.gz | |
MRWidget: Initially do merge_check request.
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/index.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 513fc6f0f03..003f2e0672b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -85,9 +85,7 @@ const mrWidgetOptions = () => ({ } }); - if (this.mr.state === 'checking') { - this.checkStatus(); - } + this.checkStatus(); }, components: { 'mr-widget-header': WidgetHeader, diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 22680fa62a3..6dcec86e0ab 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -25,6 +25,7 @@ export default class MergeRequestStore { if (data.issues_links) { const { closing, mentioned_but_not_closing } = data.issues_links; + this.relatedLinks = { closing, mentioned: mentioned_but_not_closing, |