diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 16:24:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-12 16:24:49 +0000 |
| commit | 7942d8639f2c0da7a40fcafa59f9cffeb532347a (patch) | |
| tree | 2e17e00b0aa92b47cf49e65a89a12b5ac17bb0c3 /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | |
| parent | 249023156ec4590e7a38dda5669ac1e1142ad702 (diff) | |
| parent | 9b0309db449e8cbfcbbfadd7ad4e6a43975cd791 (diff) | |
| download | gitlab-ce-7942d8639f2c0da7a40fcafa59f9cffeb532347a.tar.gz | |
Merge branch 'master' into 'dm-copy-mr-source-branch-as-gfm'dm-copy-mr-source-branch-as-gfm
# Conflicts:
# app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js index 7c6c2d21714..5452e19bd8e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js @@ -16,6 +16,7 @@ import { MissingBranchState, NotAllowedState, ReadyToMergeState, + SHAMismatchState, UnresolvedDiscussionsState, PipelineBlockedState, PipelineFailedState, @@ -203,6 +204,7 @@ export default { 'mr-widget-not-allowed': NotAllowedState, 'mr-widget-missing-branch': MissingBranchState, 'mr-widget-ready-to-merge': ReadyToMergeState, + 'mr-widget-sha-mismatch': SHAMismatchState, 'mr-widget-squash-before-merge': SquashBeforeMerge, 'mr-widget-checking': CheckingState, 'mr-widget-unresolved-discussions': UnresolvedDiscussionsState, |