Merge branch 'rs-test-seed' into 'master'

Don't disable the Rails mailer when seeding the test environment See merge request gitlab-org/gitlab-ce!15690

Merge branch 'rs-test-seed' into 'master'
c997c95d · Rémy Coutable · e0f84130 · 3f45662e · c997c95d
Commit c997c95d authored Dec 04, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

seeder.rb lib/gitlab/seeder.rb +2 -1

No files found.
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -8,7 +8,8 @@ end
 module Gitlab
  class Seeder
    def self.quiet
-      mute_mailer
+      mute_mailer unless Rails.env.test?
+
      SeedFu.quiet = true

      yield