Merge branch 'dohtaset' into 'master'

Fix charts on Cluster page

See merge request gitlab-org/gitlab-ce!30073

1 files changed, 6 insertions, 4 deletions

diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js
index edbcf84b342..97d149e9ad5 100644
--- a/app/assets/javascripts/monitoring/monitoring_bundle.js
+++ b/app/assets/javascripts/monitoring/monitoring_bundle.js
@@ -8,10 +8,12 @@ export default (props = {}) => {
   const el = document.getElementById('prometheus-graphs');
 
   if (el && el.dataset) {
-    store.dispatch('monitoringDashboard/setFeatureFlags', {
-      prometheusEndpointEnabled: gon.features.environmentMetricsUsePrometheusEndpoint,
-      multipleDashboardsEnabled: gon.features.environmentMetricsShowMultipleDashboards,
-    });
+    if (gon.features) {
+      store.dispatch('monitoringDashboard/setFeatureFlags', {
+        prometheusEndpointEnabled: gon.features.environmentMetricsUsePrometheusEndpoint,
+        multipleDashboardsEnabled: gon.features.environmentMetricsShowMultipleDashboards,
+      });
+    }
 
     const [currentDashboard] = getParameterValues('dashboard');