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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-23 00:08:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-23 00:08:48 +0300
commitb6ec12ceca58b12d974d46d0579742f4d3cdb9d7 (patch)
treec440d6195c651bac465cd37bc0d88fbd3ebefccc /app/services/deployments
parent3832718d895bf8268f3e3aac85948e2792769345 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/deployments')
-rw-r--r--app/services/deployments/link_merge_requests_service.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/services/deployments/link_merge_requests_service.rb b/app/services/deployments/link_merge_requests_service.rb
index a1d6d50bbb4..67a2230350d 100644
--- a/app/services/deployments/link_merge_requests_service.rb
+++ b/app/services/deployments/link_merge_requests_service.rb
@@ -38,6 +38,8 @@ module Deployments
.commits_between(from, to)
.map(&:id)
+ track_mr_picking = Feature.enabled?(:track_mr_picking, project)
+
# For some projects the list of commits to deploy may be very large. To
# ensure we do not end up running SQL queries with thousands of WHERE IN
# values, we run one query per a certain number of commits.
@@ -50,6 +52,13 @@ module Deployments
project.merge_requests.merged.by_merge_commit_sha(slice)
deployment.link_merge_requests(merge_requests)
+
+ next unless track_mr_picking
+
+ picked_merge_requests =
+ project.merge_requests.by_cherry_pick_sha(slice)
+
+ deployment.link_merge_requests(picked_merge_requests)
end
end