diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-06 18:13:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-06 18:13:33 +0000 |
| commit | 2d00d6d459164f9c51f9e04fe56aecdca5edfe24 (patch) | |
| tree | 97d5d477c23e2ab9eeb0b4e9b364a7ca76adec83 /app/views | |
| parent | d12f60a5c07f942d187ef840ef0a65784bb3b119 (diff) | |
| parent | 226d43b31733f4c61b2f2c54cf7a5c4374c801a6 (diff) | |
| download | gitlab-ce-2d00d6d459164f9c51f9e04fe56aecdca5edfe24.tar.gz | |
Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'
Cluster monitoring changes CE backport
See merge request gitlab-org/gitlab-ce!17547
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/environments/metrics.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml index 9d9759ebc5f..c151b5acdf7 100644 --- a/app/views/projects/environments/metrics.html.haml +++ b/app/views/projects/environments/metrics.html.haml @@ -15,7 +15,8 @@ "empty-getting-started-svg-path": image_path('illustrations/monitoring/getting_started.svg'), "empty-loading-svg-path": image_path('illustrations/monitoring/loading.svg'), "empty-unable-to-connect-svg-path": image_path('illustrations/monitoring/unable_to_connect.svg'), - "additional-metrics": additional_metrics_project_environment_path(@project, @environment, format: :json), + "metrics-endpoint": additional_metrics_project_environment_path(@project, @environment, format: :json), + "deployment-endpoint": project_environment_deployments_path(@project, @environment, format: :json), "project-path": project_path(@project), "tags-path": project_tags_path(@project), - "has-metrics": "#{@environment.has_metrics?}", deployment_endpoint: project_environment_deployments_path(@project, @environment, format: :json) } } + "has-metrics": "#{@environment.has_metrics?}" } } |