diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 13:46:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 13:46:43 +0000 |
| commit | b809f434699f3bc2adb84d0cb59f575cb44b5984 (patch) | |
| tree | f200aa6028a0fd278729b9923d1af5ee33a835d3 /app/controllers/projects | |
| parent | 1da5a103ace9c346758e9525d7f0fa55bab13599 (diff) | |
| parent | c277aac9dc1a72eb8b4584ad217996a9d7daaf14 (diff) | |
| download | gitlab-ce-b809f434699f3bc2adb84d0cb59f575cb44b5984.tar.gz | |
Merge branch 'mr-commit-optimization' into 'master'
Use persisted/memoized value for MRs sha's instead of doing git lookups
See merge request gitlab-org/gitlab-ce!17555
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index a1af125547c..54e7d81de6a 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -187,7 +187,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo begin @merge_request.environments_for(current_user).map do |environment| project = environment.project - deployment = environment.first_deployment_for(@merge_request.diff_head_commit) + deployment = environment.first_deployment_for(@merge_request.diff_head_sha) stop_url = if environment.stop_action? && can?(current_user, :create_deployment, environment) |