diff options
| author | Luc Donnet | 2018-01-03 11:57:42 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-01-03 11:57:42 +0100 |
| commit | 7cce4762c11e7d1e78433f6f88d2e12928c398dc (patch) | |
| tree | 3084d95692a70f9c5d5a842aae6f4ec0ea07a1c3 /config/environments/development.rb | |
| parent | 6497b23e18385121974f6cbf56d48caf897e69b1 (diff) | |
| parent | 414d0f6c4dd992696354757c4ae700952a7e4dd9 (diff) | |
| download | chouette-core-7cce4762c11e7d1e78433f6f88d2e12928c398dc.tar.bz2 | |
Merge branch 'master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659
Diffstat (limited to 'config/environments/development.rb')
| -rw-r--r-- | config/environments/development.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 56773d81e..e9cd16c34 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -36,9 +36,10 @@ Rails.application.configure do # config.action_view.raise_on_missing_translations = true #config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) - config.action_mailer.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.default_url_options = { :host => ENV.fetch('RAILS_HOST', 'http://localhost:3000') } config.action_mailer.default_options = { from: 'Stif BOIV <stif-boiv@af83.com>' } config.action_mailer.delivery_method = :letter_opener + config.action_mailer.asset_host = ENV.fetch('RAILS_HOST', 'http://localhost:3000') # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = true |