diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 09:05:56 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 09:05:56 +0000 |
| commit | 1797984857d3d69329e0d2baf9f778a3f63313eb (patch) | |
| tree | c0952c3306fbf20c3728af83916e81e26dd53753 | |
| parent | 18ef5be6c4f41d671398bf754dec84ba9a897609 (diff) | |
| parent | 701c1e1ecee5ee7ad2bbec78ad4557e4ae78b6c5 (diff) | |
| download | gitlab-ce-1797984857d3d69329e0d2baf9f778a3f63313eb.tar.gz | |
Merge branch '34017-common-vue' into 'master'
Remove vue from main.bundle.js
Closes #34017
See merge request !12327
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_bundle.js | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js index c7dc6863160..2c38440a2af 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js @@ -10,6 +10,11 @@ import commitPipelinesTable from './pipelines_table.vue'; const CommitPipelinesTable = Vue.extend(commitPipelinesTable); +// export for use in merge_request_tabs.js (TODO: remove this hack when we understand how to load +// vue.js in merge_request_tabs.js) +window.gl = window.gl || {}; +window.gl.CommitPipelinesTable = CommitPipelinesTable; + document.addEventListener('DOMContentLoaded', () => { const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view'); diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index f503cd38c24..7bb2236017e 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -3,12 +3,10 @@ /* global Flash */ /* global notes */ -import Vue from 'vue'; import Cookies from 'js-cookie'; import './breakpoints'; import './flash'; import BlobForkSuggestion from './blob/blob_fork_suggestion'; -import commitPipelinesTable from './commit/pipelines/pipelines_table.vue'; /* eslint-disable max-len */ // MergeRequestTabs @@ -236,7 +234,7 @@ import commitPipelinesTable from './commit/pipelines/pipelines_table.vue'; mountPipelinesView() { const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view'); - const CommitPipelinesTable = Vue.extend(commitPipelinesTable); + const CommitPipelinesTable = gl.CommitPipelinesTable; this.commitPipelinesTable = new CommitPipelinesTable({ propsData: { endpoint: pipelineTableViewEl.dataset.endpoint, |