diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-26 09:31:17 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-26 09:31:17 +0000 |
| commit | 9aa2205a15c72394234892ef3babe94ce7eb1828 (patch) | |
| tree | cae8a8f567f859b4a867a43af81cb3e8f80d50c5 /app/controllers | |
| parent | f2da36f19661353cd1bd6788fbdf1a65e2d70f8d (diff) | |
| download | gitlab-ce-9aa2205a15c72394234892ef3babe94ce7eb1828.tar.gz | |
Resolve "Memory usage notice doesn't link anywhere"
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 70c41da4de5..d361e661d0e 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -223,12 +223,18 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo if can?(current_user, :read_environment, environment) && environment.has_metrics? metrics_project_environment_deployment_path(environment.project, environment, deployment) end + + metrics_monitoring_url = + if can?(current_user, :read_environment, environment) + environment_metrics_path(environment) + end { id: environment.id, name: environment.name, url: project_environment_path(project, environment), metrics_url: metrics_url, + metrics_monitoring_url: metrics_monitoring_url, stop_url: stop_url, external_url: environment.external_url, external_url_formatted: environment.formatted_external_url, |