Commit 891d1302 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'enviroments-webpack-bundle-refactor' into 'master'

Remove webpack bundle tag for enviroments

See merge request gitlab-org/gitlab-ce!17371
parents e2638c3f aae4d8b0
...@@ -5,7 +5,7 @@ import Translate from '../vue_shared/translate'; ...@@ -5,7 +5,7 @@ import Translate from '../vue_shared/translate';
Vue.use(Translate); Vue.use(Translate);
document.addEventListener('DOMContentLoaded', () => new Vue({ export default () => new Vue({
el: '#environments-list-view', el: '#environments-list-view',
components: { components: {
environmentsComponent, environmentsComponent,
...@@ -36,4 +36,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ ...@@ -36,4 +36,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
}, },
}); });
}, },
})); });
import initEnviroments from '~/environments/';
document.addEventListener('DOMContentLoaded', initEnviroments);
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
- 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("environments")
#environments-list-view{ data: { environments_data: environments_list_data, #environments-list-view{ data: { environments_data: environments_list_data,
"can-create-deployment" => can?(current_user, :create_deployment, @project).to_s, "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
......
...@@ -44,7 +44,6 @@ function generateEntries() { ...@@ -44,7 +44,6 @@ function generateEntries() {
const manualEntries = { const manualEntries = {
balsamiq_viewer: './blob/balsamiq_viewer.js', balsamiq_viewer: './blob/balsamiq_viewer.js',
environments: './environments/environments_bundle.js',
monitoring: './monitoring/monitoring_bundle.js', monitoring: './monitoring/monitoring_bundle.js',
mr_notes: './mr_notes/index.js', mr_notes: './mr_notes/index.js',
notebook_viewer: './blob/notebook_viewer.js', notebook_viewer: './blob/notebook_viewer.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