diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-05 20:44:01 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-05 20:44:01 +0000 |
commit | d5093ef569050996aaed038f97c5a3257a77f504 (patch) | |
tree | 27fd295697131f062c609a8841339ef30235daaa /app/assets/javascripts/commit | |
parent | d97b96228973658fbd390823c1ab6f5364b33d00 (diff) | |
download | gitlab-ce-d5093ef569050996aaed038f97c5a3257a77f504.tar.gz |
Use webpack to require files
Changes after review
Diffstat (limited to 'app/assets/javascripts/commit')
4 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 index 3a06e41848b..fbfec7743c7 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js.es6 @@ -2,8 +2,6 @@ /* global Vue, CommitsPipelineStore, PipelinesService, Flash */ window.Vue = require('vue'); -require('./pipelines_store'); -require('./pipelines_service'); require('./pipelines_table'); /** * Commits View > Pipelines Tab > Pipelines Table. diff --git a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 index ef3902fba50..483b414126a 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_service.js.es6 @@ -18,7 +18,7 @@ class PipelinesService { * * @return {Promise} */ - get() { + all() { return this.pipelines.get(); } } diff --git a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 index 178e7bc9cd7..f1b41911b73 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 @@ -44,4 +44,7 @@ class PipelinesStore { } } -return PipelinesStore; +window.gl = window.gl || {}; +gl.commits = gl.commits || {}; +gl.commits.pipelines = gl.commits.pipelines || {}; +gl.commits.pipelines.PipelinesStore = PipelinesStore; diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 index 93fca933b0d..ce0dbd4d56b 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 @@ -3,9 +3,12 @@ window.Vue = require('vue'); window.Vue.use(require('vue-resource')); +require('../../lib/utils/common_utils'); require('../../vue_shared/vue_resource_interceptor'); require('../../vue_shared/components/pipelines_table'); -require('../vue_realtime_listener/index'); +require('../../vue_realtime_listener/index'); +require('./pipelines_service'); +require('./pipelines_store'); /** * @@ -62,10 +65,10 @@ require('../vue_realtime_listener/index'); * */ created() { - gl.pipelines.pipelinesService = new PipelinesService(this.endpoint); + const pipelinesService = new gl.commits.pipelines.PipelinesService(this.endpoint); this.isLoading = true; - return gl.pipelines.pipelinesService.all() + return pipelinesService.all() .then(response => response.json()) .then((json) => { this.store.storePipelines(json); |