kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '34017-common-vue' into 'master'

Browse source 
Remove vue from main.bundle.js

Closes #34017

See merge request !12327
This commit is contained in:
Tim Zallmann 2017-06-21 09:05:56 +00:00
commit 1797984857
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
View file

@ -10,6 +10,11 @@ import commitPipelinesTable from './pipelines_table.vue';
const CommitPipelinesTable = Vue.extend(commitPipelinesTable); 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', () => { document.addEventListener('DOMContentLoaded', () => {
const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view'); const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view');

4
app/assets/javascripts/merge_request_tabs.js
View file

@ -3,12 +3,10 @@
/* global Flash */ /* global Flash */
/* global notes */ /* global notes */
import Vue from 'vue';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import './breakpoints'; import './breakpoints';
import './flash'; import './flash';
import BlobForkSuggestion from './blob/blob_fork_suggestion'; import BlobForkSuggestion from './blob/blob_fork_suggestion';
import commitPipelinesTable from './commit/pipelines/pipelines_table.vue';
/* eslint-disable max-len */ /* eslint-disable max-len */
// MergeRequestTabs // MergeRequestTabs
@ -236,7 +234,7 @@ import commitPipelinesTable from './commit/pipelines/pipelines_table.vue';
mountPipelinesView() { mountPipelinesView() {
const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view'); const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view');
const CommitPipelinesTable = Vue.extend(commitPipelinesTable); const CommitPipelinesTable = gl.CommitPipelinesTable;
this.commitPipelinesTable = new CommitPipelinesTable({ this.commitPipelinesTable = new CommitPipelinesTable({
propsData: { propsData: {
endpoint: pipelineTableViewEl.dataset.endpoint, endpoint: pipelineTableViewEl.dataset.endpoint,