diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-16 13:27:46 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-16 13:27:46 +0300 |
| commit | 7b68bdce15a2f02d0b55d9fd43473408858cd6b6 (patch) | |
| tree | 8430a7fc007a57398e08ebbce9a7c28fcdf33e8f /app/controllers/projects/merge_requests_controller.rb | |
| parent | 1b46a8360e0adffba79fad5730e94e333350f063 (diff) | |
| parent | 142b9ec4a0b3e5d5cbcbb2fc3b201755f0966b9f (diff) | |
Merge branch 'rs-trailingwhitespace-cop' into 'master'
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 4de814d0ca8..2a3b73577a5 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -218,8 +218,8 @@ 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 = + + metrics_monitoring_url = if can?(current_user, :read_environment, environment) environment_metrics_path(environment) end |