diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-27 18:30:40 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-27 18:30:40 +0000 |
| commit | e29a51360fb3a2b3f96e697110fd9542d6773880 (patch) | |
| tree | 5dca41406bc1d384aff7ba78662feb81319219f8 | |
| parent | 50b69083d19fca516a9e0425f7b1bab4b84c2b18 (diff) | |
| parent | e1ff11db5a011b042b7020d40851bec0e7b47ec8 (diff) | |
| download | gitlab-ce-e29a51360fb3a2b3f96e697110fd9542d6773880.tar.gz | |
Merge branch 'dohtaset' into 'master'
Fix charts on Cluster page
See merge request gitlab-org/gitlab-ce!30073
| -rw-r--r-- | app/assets/javascripts/monitoring/monitoring_bundle.js | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/dohtaset.yml | 5 |
2 files changed, 11 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'); diff --git a/changelogs/unreleased/dohtaset.yml b/changelogs/unreleased/dohtaset.yml new file mode 100644 index 00000000000..5b917bd06d8 --- /dev/null +++ b/changelogs/unreleased/dohtaset.yml @@ -0,0 +1,5 @@ +--- +title: Fix charts on Cluster health page +merge_request: 30073 +author: +type: fixed |