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:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-04-07 00:01:32 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2017-04-07 00:01:32 +0300
commitae97b592d0b81ca8119d57eda25ca5b406dd3f12 (patch)
tree047212b8561b8b0fe00061509532038398757fba
parent67cda6c6b05abb7d26c9542e066843b17a68b184 (diff)
-rwxr-xr-xapp/controllers/projects/merge_requests_controller.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2696c964b60..c9b0793faab 100755
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -523,10 +523,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
metrics_url =
- if environment.has_metrics? && can?(current_user, :read_environment, environment)
- metrics_namespace_project_environment_path(environment.project.namespace,
+ if environment.has_metrics? && can?(current_user, :read_deployment, deployment)
+ metrics_namespace_project_environment_deployment_path(environment.project.namespace,
environment.project,
- environment)
+ environment,
+ deployment)
+
end
{