summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/grafana_integration/store/state.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:12 +0000
commit2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 (patch)
tree4d6b995e3292562627ddeeacbc5b5eba0ce64032 /app/assets/javascripts/grafana_integration/store/state.js
parenteb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (diff)
downloadgitlab-ce-2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/grafana_integration/store/state.js')
-rw-r--r--app/assets/javascripts/grafana_integration/store/state.js3
1 files changed, 3 insertions, 0 deletions
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,
});