diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-04 09:41:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-04 09:41:43 +0000 |
| commit | c997c95dfca2c3d30f8c7b8ef5f0fd95c1356226 (patch) | |
| tree | f3efd13edc684a0c96877adc0f7393d8cfcbb302 | |
| parent | e0f84130567dc34edf1ae75fcf595e24991d2fa9 (diff) | |
| parent | 3f45662e5af2f1cb477d2e7e08965f9ffd0304f7 (diff) | |
| download | gitlab-ce-c997c95dfca2c3d30f8c7b8ef5f0fd95c1356226.tar.gz | |
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
| -rw-r--r-- | lib/gitlab/seeder.rb | 3 |
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 |