summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/dependencies.js
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-04 23:38:59 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-04 23:38:59 +0100
commit3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch)
tree6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /app/assets/javascripts/vue_merge_request_widget/dependencies.js
parent0abce36cd20cdd3579138bee835d28519a5593f2 (diff)
parentcf887a8b3108edb715ee5618377f4ffab1824d85 (diff)
downloadgitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/dependencies.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/dependencies.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
index b930aca6877..7ca15537719 100644
--- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js
+++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
@@ -11,12 +11,12 @@
export { default as Vue } from 'vue';
export { default as SmartInterval } from '~/smart_interval';
-export { default as WidgetHeader } from './components/mr_widget_header';
-export { default as WidgetMergeHelp } from './components/mr_widget_merge_help';
+export { default as WidgetHeader } from './components/mr_widget_header.vue';
+export { default as WidgetMergeHelp } from './components/mr_widget_merge_help.vue';
export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue';
export { default as WidgetDeployment } from './components/mr_widget_deployment';
-export { default as WidgetRelatedLinks } from './components/mr_widget_related_links';
-export { default as MergedState } from './components/states/mr_widget_merged';
+export { default as WidgetRelatedLinks } from './components/mr_widget_related_links.vue';
+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';