summaryrefslogtreecommitdiff
path: root/lib/gitlab/seeder.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-12-05 02:37:52 +0900
committerShinya Maeda <shinya@gitlab.com>2017-12-05 02:37:52 +0900
commit216173d18fd19e13503f145da3ef74f1a7da7b8b (patch)
tree3d53aa775b6b797371d8e7aeff1e35a349ddebf7 /lib/gitlab/seeder.rb
parent346dcb0626a68ddb1432588e01f78da913cfd827 (diff)
parent8f9622bb5ab96bf21798ae1b960b3c969db15e5d (diff)
downloadgitlab-ce-216173d18fd19e13503f145da3ef74f1a7da7b8b.tar.gz
Merge branch 'master' into 35616-move-k8-to-cluster-page
Diffstat (limited to 'lib/gitlab/seeder.rb')
-rw-r--r--lib/gitlab/seeder.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index f9ab9bd466f..30df7e4a831 100644
--- 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