From 2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 7 Nov 2019 06:06:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/grafana_integration/store/state.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/assets/javascripts/grafana_integration/store/state.js') diff --git a/app/assets/javascripts/grafana_integration/store/state.js b/app/assets/javascripts/grafana_integration/store/state.js index c25742c82bc..a912eb58327 100644 --- a/app/assets/javascripts/grafana_integration/store/state.js +++ b/app/assets/javascripts/grafana_integration/store/state.js @@ -1,5 +1,8 @@ +import { parseBoolean } from '~/lib/utils/common_utils'; + export default (initialState = {}) => ({ operationsSettingsEndpoint: initialState.operationsSettingsEndpoint, grafanaToken: initialState.grafanaIntegrationToken || '', grafanaUrl: initialState.grafanaIntegrationUrl || '', + grafanaEnabled: parseBoolean(initialState.grafanaIntegrationEnabled) || false, }); -- cgit v1.2.1