From 43b0dddf3859887b78569b832dd9a820ea66d652 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 9 Apr 2018 19:35:11 +0200 Subject: Fix enviroments seeding on certain branch names Bit of a cryptic commit title, but our seeding will try to guard against branchnames being anything but alphanumerical. These charachters we gsub away but can't have an empty string as replacement. This change is less efficient, but given that the number of seeded MRs per project is very limited, this should be ok. --- db/fixtures/development/19_environments.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'db/fixtures') diff --git a/db/fixtures/development/19_environments.rb b/db/fixtures/development/19_environments.rb index c1bbc9af6d6..00a14f458d1 100644 --- a/db/fixtures/development/19_environments.rb +++ b/db/fixtures/development/19_environments.rb @@ -28,7 +28,11 @@ class Gitlab::Seeder::Environments end def create_merge_request_review_deployments! - @project.merge_requests.sample(4).map do |merge_request| + @project + .merge_requests + .select { |mr| mr.source_branch.match(/\p{Alnum}+/) } + .sample(4) + .each do |merge_request| next unless merge_request.diff_head_sha create_deployment!( -- cgit v1.2.1