Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-22 04:28:20 +0300
committerMike Greiling <mike@pixelcog.com>2017-03-22 04:28:20 +0300
commit228564749dcbbcd7284141dee50e52cef8ea300e (patch)
tree8f987dc5bd1df757fa8a76ccca722984a3281e98
parent32935bc97c214a056ca5c54731be0e5e8f34af50 (diff)
move common vue script to vue_shared directory
-rw-r--r--app/assets/javascripts/vue_shared/common_vue.js (renamed from app/assets/javascripts/commons/vue.js)4
-rw-r--r--config/webpack.config.js2
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/vue_shared/common_vue.js
index 9e54c406d0a..eb2a6071fda 100644
--- a/app/assets/javascripts/commons/vue.js
+++ b/app/assets/javascripts/vue_shared/common_vue.js
@@ -1,7 +1,5 @@
import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+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 a38c7967002..3cf94b9b435 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -18,7 +18,7 @@ var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'),
entry: {
common: './commons/index.js',
- common_vue: './commons/vue.js',
+ common_vue: ['vue', './vue_shared/common_vue.js'],
common_d3: ['d3'],
main: './main.js',
blob_edit: './blob_edit/blob_edit_bundle.js',