Commit b5075640 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'pipelines_show_refactor' into 'master'

Refactor pipelines show for webpack bundle tag removal

See merge request gitlab-org/gitlab-ce!17127
parents 891d1302 9353c5c7
import initPipelineDetails from '~/pipelines/pipeline_details_bundle';
import initPipelines from '../init_pipelines'; import initPipelines from '../init_pipelines';
document.addEventListener('DOMContentLoaded', initPipelines); document.addEventListener('DOMContentLoaded', () => {
initPipelines();
initPipelineDetails();
});
import initPipelineDetails from '~/pipelines/pipeline_details_bundle';
import initPipelines from '../init_pipelines'; import initPipelines from '../init_pipelines';
document.addEventListener('DOMContentLoaded', initPipelines); document.addEventListener('DOMContentLoaded', () => {
initPipelines();
initPipelineDetails();
});
...@@ -9,7 +9,7 @@ import eventHub from './event_hub'; ...@@ -9,7 +9,7 @@ import eventHub from './event_hub';
Vue.use(Translate); Vue.use(Translate);
document.addEventListener('DOMContentLoaded', () => { export default () => {
const dataset = document.querySelector('.js-pipeline-details-vue').dataset; const dataset = document.querySelector('.js-pipeline-details-vue').dataset;
const mediator = new PipelinesMediator({ endpoint: dataset.endpoint }); const mediator = new PipelinesMediator({ endpoint: dataset.endpoint });
...@@ -70,4 +70,4 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -70,4 +70,4 @@ document.addEventListener('DOMContentLoaded', () => {
}); });
}, },
}); });
}); };
...@@ -13,4 +13,3 @@ ...@@ -13,4 +13,3 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag('common_vue') = webpack_bundle_tag('common_vue')
= webpack_bundle_tag('pipelines_details')
...@@ -48,7 +48,6 @@ function generateEntries() { ...@@ -48,7 +48,6 @@ function generateEntries() {
mr_notes: './mr_notes/index.js', mr_notes: './mr_notes/index.js',
notebook_viewer: './blob/notebook_viewer.js', notebook_viewer: './blob/notebook_viewer.js',
pdf_viewer: './blob/pdf_viewer.js', pdf_viewer: './blob/pdf_viewer.js',
pipelines_details: './pipelines/pipeline_details_bundle.js',
protected_branches: './protected_branches', protected_branches: './protected_branches',
protected_tags: './protected_tags', protected_tags: './protected_tags',
registry_list: './registry/index.js', registry_list: './registry/index.js',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment