summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2018-10-29 11:34:41 +0000
committerNick Thomas <nick@gitlab.com>2018-10-29 11:34:41 +0000
commitdadc046d3a5c797294330bcd26acdadac069c9cc (patch)
tree3468d1ca9b320315f3d4d5e5e032e6d547cc2550 /app/assets/javascripts/vue_merge_request_widget/stores
parent289651e26f5b18cc68dcdd052939cd878ca66092 (diff)
downloadgitlab-ce-dadc046d3a5c797294330bcd26acdadac069c9cc.tar.gz
post merge pipeline and environments status
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js2
1 files changed, 2 insertions, 0 deletions
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 e6655914700..a0c008e7314 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
@@ -32,7 +32,9 @@ export default class MergeRequestStore {
this.commitsCount = data.commits_count;
this.divergedCommitsCount = data.diverged_commits_count;
this.pipeline = data.pipeline || {};
+ this.mergePipeline = data.merge_pipeline || {};
this.deployments = this.deployments || data.deployments || [];
+ this.postMergeDeployments = this.postMergeDeployments || [];
this.initRebase(data);
if (data.issues_links) {