diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-03-31 21:16:35 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-04-03 22:19:38 +0300 |
| commit | a9619ce3f3876b135bb27bf7cf9140eed99d4875 (patch) | |
| tree | 15fdc3c259d9e376bab2f7ba36e4d5ee594fdffc | |
| parent | 82e72ab43ca4175230e8080928b25b3f68ced415 (diff) | |
| download | gitlab-ce-a9619ce3f3876b135bb27bf7cf9140eed99d4875.tar.gz | |
MRWidget: Make pipelines empty object as default.
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/index.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index c8bd94e86e5..47e0425dacf 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -43,7 +43,7 @@ const mrWidgetOptions = () => ({ return statesToShowHelpWidget.indexOf(this.mr.state) > -1; }, shouldRenderPipelines() { - return this.mr.pipeline || this.mr.hasCI; + return Object.keys(this.mr.pipeline).length || this.mr.hasCI; }, shouldRenderRelatedLinks() { return this.mr.relatedLinks; 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 6dcec86e0ab..44873549703 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 @@ -20,7 +20,7 @@ export default class MergeRequestStore { this.commitMessage = data.merge_commit_message; this.commitMessageWithDescription = data.merge_commit_message_with_description; this.divergedCommitsCount = data.diverged_commits_count; - this.pipeline = data.pipeline; + this.pipeline = data.pipeline || {}; this.deployments = this.deployments || data.deployments || []; if (data.issues_links) { |