diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 03:07:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-30 03:07:52 +0300 |
| commit | 4c016ad02422709d3a341215952a9b1cdb4a8451 (patch) | |
| tree | 599e58df9e1f8987a9f9400b0abf61612e4e125a /app/views/projects/settings | |
| parent | cb3e6b9c1b020378b5f94b4c38319a2dc961de01 (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.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/operations/show.html.haml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/settings/operations/_grafana_integration.html.haml b/app/views/projects/settings/operations/_grafana_integration.html.haml new file mode 100644 index 00000000000..ae90b6dd5aa --- /dev/null +++ b/app/views/projects/settings/operations/_grafana_integration.html.haml @@ -0,0 +1,2 @@ +.js-grafana-integration{ data: { operations_settings_endpoint: project_settings_operations_path(@project), + grafana_integration: { url: grafana_integration_url, token: grafana_integration_token } } } diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index 0a7a155bc12..3c955e5f558 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -5,4 +5,5 @@ = render_if_exists 'projects/settings/operations/incidents' = render 'projects/settings/operations/error_tracking' = render 'projects/settings/operations/external_dashboard' += render 'projects/settings/operations/grafana_integration' = render_if_exists 'projects/settings/operations/tracing' |