diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-27 10:02:49 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-27 10:02:49 +0000 |
| commit | d01252024ae75fb60f9e1dd51e85519649736e80 (patch) | |
| tree | d331f20c9745c321de51fa3608c664ddd0c7791c /app/assets/javascripts/vue_merge_request_widget | |
| parent | 6358004b1c64ed3f8b83a75a672a0a72e1bee851 (diff) | |
| parent | a4885b8f37602c399efff028b0a733ef80fbe7ab (diff) | |
| download | gitlab-ce-d01252024ae75fb60f9e1dd51e85519649736e80.tar.gz | |
Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tags
# Conflicts:
# app/assets/javascripts/pages/projects/merge_requests/show/index.js
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index 109a302a172..54a98abf860 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/require-default-prop */ - import pipelineStage from '../../pipelines/components/stage.vue'; - import ciIcon from '../../vue_shared/components/ci_icon.vue'; - import icon from '../../vue_shared/components/icon.vue'; + import pipelineStage from '~/pipelines/components/stage.vue'; + import ciIcon from '~/vue_shared/components/ci_icon.vue'; + import icon from '~/vue_shared/components/icon.vue'; export default { name: 'MRWidgetPipeline', |