From e35b1ba164c2d935eac2a214e674aa82ce6e660f Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Tue, 8 May 2018 23:42:16 +0000 Subject: Fix invalid component name for ShaMismatch state. --- app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', }; -- cgit v1.2.1