summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-05-08 23:42:16 +0000
committerFatih Acet <acetfatih@gmail.com>2018-05-08 23:42:16 +0000
commite35b1ba164c2d935eac2a214e674aa82ce6e660f (patch)
tree6eb651764ab47e633aa217a8fef0333077d1502d
parent5b0e96d09a7b6309384ef4c300c56872adba0626 (diff)
downloadgitlab-ce-acet-mr-widget-component-name-fix.tar.gz
Fix invalid component name for ShaMismatch state.acet-mr-widget-component-name-fix
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js2
1 files changed, 1 insertions, 1 deletions
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 e080ce5c229..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
@@ -16,7 +16,7 @@ const stateToComponentMap = {
mergeWhenPipelineSucceeds: 'mr-widget-merge-when-pipeline-succeeds',
failedToMerge: 'mr-widget-failed-to-merge',
autoMergeFailed: 'mr-widget-auto-merge-failed',
- shaMismatch: 'sha-mismatch',
+ shaMismatch: 'mr-widget-sha-mismatch',
rebase: 'mr-widget-rebase',
};