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:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 09:06:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 09:06:12 +0300
commit2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 (patch)
tree4d6b995e3292562627ddeeacbc5b5eba0ce64032 /app/views/projects/settings
parenteb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r--app/views/projects/settings/operations/_grafana_integration.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/settings/operations/_grafana_integration.html.haml b/app/views/projects/settings/operations/_grafana_integration.html.haml
index ae90b6dd5aa..cd5b5abd9ce 100644
--- a/app/views/projects/settings/operations/_grafana_integration.html.haml
+++ b/app/views/projects/settings/operations/_grafana_integration.html.haml
@@ -1,2 +1,2 @@
.js-grafana-integration{ data: { operations_settings_endpoint: project_settings_operations_path(@project),
- grafana_integration: { url: grafana_integration_url, token: grafana_integration_token } } }
+ grafana_integration: { url: grafana_integration_url, token: grafana_integration_token, enabled: grafana_integration_enabled?.to_s } } }