diff options
author | Phil Hughes <me@iamphill.com> | 2018-03-12 12:08:47 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-12 12:08:47 +0000 |
commit | 277fac40f10cf918d63ca558175c7b3e17fdd2e9 (patch) | |
tree | 7b0e6546487f8e90158e4f7c5b3999f974a43c9e /app/assets/javascripts/vue_merge_request_widget/stores | |
parent | bd26e012fcd50d0ff5c1ad7febc9d6355e43a6fc (diff) | |
download | gitlab-ce-277fac40f10cf918d63ca558175c7b3e17fdd2e9.tar.gz |
Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-state
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.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js | 1 |
2 files changed, 5 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 5d07bcf1bb9..a47ca9fae86 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 @@ -125,6 +125,10 @@ export default class MergeRequestStore { return this.state === stateKey.nothingToMerge; } + get isMergedState() { + return this.state === stateKey.merged; + } + initRebase(data) { this.canPushToSourceBranch = data.can_push_to_source_branch; this.rebaseInProgress = data.rebase_in_progress; diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js b/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js index 29d5bd4a1da..483ad52b8cc 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js @@ -49,6 +49,7 @@ export const stateKey = { notAllowedToMerge: 'notAllowedToMerge', readyToMerge: 'readyToMerge', rebase: 'rebase', + merged: 'merged', }; export default { |