summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-10-03 11:39:42 -0500
committerBrett Walker <bwalker@gitlab.com>2018-10-04 13:28:52 -0500
commit7ee8771c5cdedcffadee081358e1239ba71aede0 (patch)
tree477f871b9afe5b21069068ca51e440ae05ee68b0 /app/controllers/projects
parent1973d0c183218e7ca826d627eaea5ce91a17bed3 (diff)
downloadgitlab-ce-7ee8771c5cdedcffadee081358e1239ba71aede0.tar.gz
Don't build project services unneccesarily
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb4
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 d691744d72a..6a5da9b8292 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -207,7 +207,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
environments =
begin
@merge_request.environments_for(current_user).map do |environment|
- project = environment.project
+ project = environment.project
deployment = environment.first_deployment_for(@merge_request.diff_head_sha)
stop_url =
@@ -217,7 +217,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
metrics_url =
if can?(current_user, :read_environment, environment) && environment.has_metrics?
- metrics_project_environment_deployment_path(environment.project, environment, deployment)
+ metrics_project_environment_deployment_path(project, environment, deployment)
end
metrics_monitoring_url =