diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-15 14:47:29 +0000 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-01-15 14:47:29 +0000 |
| commit | 5cb321c8536eccb2de01a88254661aaaf5219b2f (patch) | |
| tree | d78e91831241bfe60a17df9e14304e2bf3ff4f11 | |
| parent | aeb5ef20cf0683c884a74c1e7a96b26c6eb2eebf (diff) | |
| parent | 4da7547b6dc70cb1dbd30ad816883a883de0091d (diff) | |
| download | gitlab-ce-5cb321c8536eccb2de01a88254661aaaf5219b2f.tar.gz | |
Merge branch 'no-mail-during-dev-bootstrap' into 'master'
Don't send (fake) email during dev bootstrap
This allows you to do:
rake dev:setup BOOTSTRAP=1
and prevent dozens of letter_opener email popups in your browser.
In the latest GDK we automatically set BOOTSTRAP=1 during `make`.
[ci skip]
See merge request !2447
| -rw-r--r-- | config/environments/development.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index c22722c606b..257c163720a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,6 +34,8 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Open sent mails in browser config.action_mailer.delivery_method = :letter_opener + # Don't make a mess when bootstrapping a development environment + config.action_mailer.perform_deliveries = (ENV['BOOTSTRAP'] != '1') config.eager_load = false end |