Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-11

f8f35c11 · GitLab Bot · 4720da84 · 6b246360 · f8f35c11
Commit f8f35c11 authored Apr 11, 2018 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

db/fixtures/development/19_environments.rb db/fixtures/development/19_environments.rb +5 -1

No files found.
--- 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!(