diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-17 18:54:54 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-17 19:52:48 +0300 |
commit | c59750de6f9c4f58b9dec9eea685d8549ce9ef00 (patch) | |
tree | b1757d2fd89b78f2bba45f8df6ea93e2e44847e3 /app/assets/javascripts/environments/folder | |
parent | 953c2547a26992a89e7c540b80db3759f31a8e28 (diff) |
Fix depenendencies loading Vue in EE
Diffstat (limited to 'app/assets/javascripts/environments/folder')
-rw-r--r-- | app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 | 1 | ||||
-rw-r--r-- | app/assets/javascripts/environments/folder/environments_folder_view.js.es6 | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 index 29f704c1a37..d2ca465351a 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 +++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 @@ -1,5 +1,4 @@ const EnvironmentsFolderComponent = require('./environments_folder_view'); -require('../../vue_shared/vue_resource_interceptor'); $(() => { window.gl = window.gl || {}; diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 index 0b1204559da..53d52965758 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 +++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 @@ -1,13 +1,14 @@ /* eslint-disable no-param-reassign, no-new */ /* global Flash */ -const Vue = require('vue'); -Vue.use(require('vue-resource')); +const Vue = window.Vue = require('vue'); +window.Vue.use(require('vue-resource')); const EnvironmentsService = require('../services/environments_service'); const EnvironmentTable = require('../components/environments_table'); const EnvironmentsStore = require('../stores/environments_store'); require('../../vue_shared/components/table_pagination'); require('../../lib/utils/common_utils'); +require('../../vue_shared/vue_resource_interceptor'); module.exports = Vue.component('environment-folder-view', { |