diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 20:26:13 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 20:26:13 +0000 |
| commit | 891d13022deeebe5f44a2e0387f27a32c8e878e5 (patch) | |
| tree | f37bb21a015761570470edbc7f8ba33c23da4f40 | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| parent | aae4d8b014dc16fe1807b74957e6e586d67f0baf (diff) | |
| download | gitlab-ce-891d13022deeebe5f44a2e0387f27a32c8e878e5.tar.gz | |
Merge branch 'enviroments-webpack-bundle-refactor' into 'master'
Remove webpack bundle tag for enviroments
See merge request gitlab-org/gitlab-ce!17371
| -rw-r--r-- | app/assets/javascripts/environments/index.js (renamed from app/assets/javascripts/environments/environments_bundle.js) | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/environments/index.js | 3 | ||||
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/environments/environments_bundle.js b/app/assets/javascripts/environments/index.js index 2e0a4001b7c..afc4aba6554 100644 --- a/app/assets/javascripts/environments/environments_bundle.js +++ b/app/assets/javascripts/environments/index.js @@ -5,7 +5,7 @@ import Translate from '../vue_shared/translate'; Vue.use(Translate); -document.addEventListener('DOMContentLoaded', () => new Vue({ +export default () => new Vue({ el: '#environments-list-view', components: { environmentsComponent, @@ -36,4 +36,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ }, }); }, -})); +}); diff --git a/app/assets/javascripts/pages/projects/environments/index.js b/app/assets/javascripts/pages/projects/environments/index.js new file mode 100644 index 00000000000..ace8af00ece --- /dev/null +++ b/app/assets/javascripts/pages/projects/environments/index.js @@ -0,0 +1,3 @@ +import initEnviroments from '~/environments/'; + +document.addEventListener('DOMContentLoaded', initEnviroments); diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 31cf173fa9c..0d656b25bc8 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -4,7 +4,6 @@ - content_for :page_specific_javascripts do = webpack_bundle_tag("common_vue") - = webpack_bundle_tag("environments") #environments-list-view{ data: { environments_data: environments_list_data, "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s, diff --git a/config/webpack.config.js b/config/webpack.config.js index d8ba3c06d3a..0d2b5dd3fa7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -44,7 +44,6 @@ function generateEntries() { const manualEntries = { balsamiq_viewer: './blob/balsamiq_viewer.js', - environments: './environments/environments_bundle.js', monitoring: './monitoring/monitoring_bundle.js', mr_notes: './mr_notes/index.js', notebook_viewer: './blob/notebook_viewer.js', |