summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorkushalpandya <kushal@gitlab.com>2017-05-09 19:30:22 +0530
committerkushalpandya <kushal@gitlab.com>2017-05-09 19:30:22 +0530
commitf66006169bf94de749bfdcb9b57ca178f4bf6f68 (patch)
tree4f6bda983f92df7e940f5573b37171e6426b5fa9 /app/controllers
parent7ea12d8067357f8e846e26b05a1dc4ab3d5a5a93 (diff)
downloadgitlab-ce-f66006169bf94de749bfdcb9b57ca178f4bf6f68.tar.gz
Add Prometheus memory sparkline to MR widget
Diffstat (limited to 'app/controllers')
-rwxr-xr-xapp/controllers/projects/merge_requests_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 44c7eb86855..207fbad7856 100755
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -410,10 +410,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
metrics_url =
if can?(current_user, :read_environment, environment) && environment.has_metrics?
- metrics_namespace_project_environment_path(environment.project.namespace,
- environment.project,
- environment,
- deployment)
+ metrics_namespace_project_environment_deployment_path(environment.project.namespace,
+ environment.project,
+ environment,
+ deployment)
end
{