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/dependencies.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/dependencies.js')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/dependencies.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index 3b5c973e4a0..7f5f28091da 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -21,7 +21,7 @@ export { default as MergedState } from './components/states/mr_widget_merged.vue export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge.vue'; export { default as ClosedState } from './components/states/mr_widget_closed.vue'; export { default as MergingState } from './components/states/mr_widget_merging.vue'; -export { default as WipState } from './components/states/mr_widget_wip'; +export { default as WorkInProgressState } from './components/states/work_in_progress.vue'; export { default as ArchivedState } from './components/states/mr_widget_archived.vue'; export { default as ConflictsState } from './components/states/mr_widget_conflicts.vue'; export { default as NothingToMergeState } from './components/states/nothing_to_merge.vue'; |