Merge branch 'ce-to-ee-2018-04-11' into 'master'

CE upstream - 2018-04-11 00:24 UTC

See merge request gitlab-org/gitlab-ee!5318

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!(