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-18 01:41:11 +0300
committerMike Greiling <mike@pixelcog.com>2017-03-21 06:12:01 +0300
commit0d885e488717905425f0a230a64659470e531f65 (patch)
treeb4124f6c4394d3044d5c0c1e70eadeebe377cc24
parent96c7bd0378cb7a87c05913f0977916a46d01352d (diff)
remove additional instances of window.Vue
-rw-r--r--app/assets/javascripts/commit/pipelines/pipelines_bundle.js6
-rw-r--r--app/assets/javascripts/vue_pipelines_index/index.js4
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
index a9f2d462c31..a92e068ca5a 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
@@ -1,8 +1,10 @@
/* eslint-disable no-param-reassign */
+
+import Vue from 'vue';
+import VueResource from 'vue-resource';
import CommitPipelinesTable from './pipelines_table';
-window.Vue = require('vue');
-window.Vue.use(require('vue-resource'));
+Vue.use(VueResource);
/**
* Commits View > Pipelines Tab > Pipelines Table.
diff --git a/app/assets/javascripts/vue_pipelines_index/index.js b/app/assets/javascripts/vue_pipelines_index/index.js
index b4e2d3a1143..104154a715b 100644
--- a/app/assets/javascripts/vue_pipelines_index/index.js
+++ b/app/assets/javascripts/vue_pipelines_index/index.js
@@ -1,10 +1,8 @@
+import Vue from 'vue';
import PipelinesStore from './stores/pipelines_store';
import PipelinesComponent from './pipelines';
import '../vue_shared/vue_resource_interceptor';
-const Vue = window.Vue = require('vue');
-window.Vue.use(require('vue-resource'));
-
$(() => new Vue({
el: document.querySelector('.vue-pipelines-index'),