diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 10:49:30 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 10:49:30 -0500 |
| commit | 5955caed321e242bfebe52a4b47346a01a50e4f6 (patch) | |
| tree | d9710c0732ce21801b4a79a281bec0bd39582a95 /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | |
| parent | f9e2b4730f58ba630344c9554eb907ab003abbd5 (diff) | |
| parent | 533593e95cd3a922a2ec2ea43b345862361dfd67 (diff) | |
| download | gitlab-ce-5955caed321e242bfebe52a4b47346a01a50e4f6.tar.gz | |
Merge branch 'master' into bootstrap4
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 | 4 |
1 files changed, 2 insertions, 2 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 0be5d9e5a55..345f9ac1b4b 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 @@ -12,7 +12,7 @@ import { ClosedState, MergingState, RebaseState, - WipState, + WorkInProgressState, ArchivedState, ConflictsState, NothingToMergeState, @@ -220,7 +220,7 @@ export default { 'mr-widget-closed': ClosedState, 'mr-widget-merging': MergingState, 'mr-widget-failed-to-merge': FailedToMerge, - 'mr-widget-wip': WipState, + 'mr-widget-wip': WorkInProgressState, 'mr-widget-archived': ArchivedState, 'mr-widget-conflicts': ConflictsState, 'mr-widget-nothing-to-merge': NothingToMergeState, |