diff options
| author | kushalpandya <kushal@gitlab.com> | 2017-09-04 21:22:59 +0530 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-09-05 13:11:20 +0530 |
| commit | 29990051f31fcf252f14a04f8461936d62ac7f21 (patch) | |
| tree | 85e0a3610577c6fbcac7a40b6f59f0678371548c | |
| parent | fe450764c587987d5d40f22291b8e09baad4f3b1 (diff) | |
| download | gitlab-ce-29990051f31fcf252f14a04f8461936d62ac7f21.tar.gz | |
Move `common_vue` into vendor bundle
| -rw-r--r-- | app/assets/javascripts/commons/index.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/commons/vue.js (renamed from app/assets/javascripts/vue_shared/common_vue.js) | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/commons/index.js b/app/assets/javascripts/commons/index.js index 6db8b3afbef..768453b28f1 100644 --- a/app/assets/javascripts/commons/index.js +++ b/app/assets/javascripts/commons/index.js @@ -2,3 +2,4 @@ import 'underscore'; import './polyfills'; import './jquery'; import './bootstrap'; +import './vue'; diff --git a/app/assets/javascripts/vue_shared/common_vue.js b/app/assets/javascripts/commons/vue.js index eb2a6071fda..8b62d78c043 100644 --- a/app/assets/javascripts/vue_shared/common_vue.js +++ b/app/assets/javascripts/commons/vue.js @@ -1,5 +1,4 @@ import Vue from 'vue'; -import './vue_resource_interceptor'; if (process.env.NODE_ENV !== 'production') { Vue.config.productionTip = false; diff --git a/config/webpack.config.js b/config/webpack.config.js index ad88e48550d..6b0cd023291 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,7 +30,7 @@ var config = { blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', common: './commons/index.js', - common_vue: ['vue', './vue_shared/common_vue.js'], + common_vue: './vue_shared/vue_resource_interceptor.js', common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', |