Commit f34f4ba5 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master'

remove webpack bundle tag for monitoring:environments:metrics

See merge request gitlab-org/gitlab-ce!16638
parents d3f42147 0b47c94a
...@@ -68,6 +68,11 @@ import SearchAutocomplete from './search_autocomplete'; ...@@ -68,6 +68,11 @@ import SearchAutocomplete from './search_autocomplete';
.catch(fail); .catch(fail);
shortcut_handler = true; shortcut_handler = true;
break; break;
case 'projects:environments:metrics':
import('./pages/projects/environments/metrics')
.then(callDefault)
.catch(fail);
break;
case 'projects:merge_requests:index': case 'projects:merge_requests:index':
import('./pages/projects/merge_requests/index') import('./pages/projects/merge_requests/index')
.then(callDefault) .then(callDefault)
......
import Vue from 'vue'; import Vue from 'vue';
import Dashboard from './components/dashboard.vue'; import Dashboard from './components/dashboard.vue';
document.addEventListener('DOMContentLoaded', () => new Vue({ export default () => new Vue({
el: '#prometheus-graphs', el: '#prometheus-graphs',
render: createElement => createElement(Dashboard), render: createElement => createElement(Dashboard),
})); });
import monitoringBundle from '~/monitoring/monitoring_bundle';
export default monitoringBundle;
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,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 'common_d3' = webpack_bundle_tag 'common_d3'
= webpack_bundle_tag 'monitoring'
.prometheus-container{ class: container_class } .prometheus-container{ class: container_class }
.top-area .top-area
......
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