Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-20 11:50:31 +0300
committerJose Ivan Vargas Lopez <jvargas@gitlab.com>2017-06-26 17:44:03 +0300
commit871bf96c9b231b5c2281a021599959c4f164b479 (patch)
tree31b12a94ae2faaf39792f75f2b117a94df0ade01 /app/assets/javascripts/monitoring/monitoring_bundle.js
parent676c559409b8b51e3e97abab24bbb44207744e13 (diff)
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'
Additional metrics dashboard See merge request !11740
Diffstat (limited to 'app/assets/javascripts/monitoring/monitoring_bundle.js')
-rw-r--r--app/assets/javascripts/monitoring/monitoring_bundle.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js
index b3ce9310417..5d5cb56af72 100644
--- a/app/assets/javascripts/monitoring/monitoring_bundle.js
+++ b/app/assets/javascripts/monitoring/monitoring_bundle.js
@@ -1,6 +1,10 @@
-import PrometheusGraph from './prometheus_graph';
+import Vue from 'vue';
+import Monitoring from './components/monitoring.vue';
-document.addEventListener('DOMContentLoaded', function onLoad() {
- document.removeEventListener('DOMContentLoaded', onLoad, false);
- return new PrometheusGraph();
-}, false);
+document.addEventListener('DOMContentLoaded', () => new Vue({
+ el: '#prometheus-graphs',
+ components: {
+ 'monitoring-dashboard': Monitoring,
+ },
+ render: createElement => createElement('monitoring-dashboard'),
+}));