diff options
| author | Jonne Haß <me@mrzyx.de> | 2012-09-07 23:46:13 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2012-09-07 23:46:13 +0400 |
| commit | d27408d8a93c63e0e5d6b590434f4dbd1d447e4d (patch) | |
| tree | a47026747e85dfcaf1d78c473da3ae3c5b0a8431 /config/initializers | |
| parent | edc9d75df7dc231300a1a1d453f638f1ea9fb179 (diff) | |
set perform_deliveries, this should fix #3524
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/mailer_config.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index cde7ecd04..b8b818c5d 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -7,6 +7,7 @@ Diaspora::Application.configure do config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme, :host => AppConfig[:pod_uri].authority } config.action_mailer.asset_host = AppConfig[:pod_uri].to_s + config.action_mailer.perform_deliveries = AppConfig[:mailer_on] unless Rails.env == 'test' || AppConfig[:mailer_on] != true if AppConfig[:mailer_method] == 'messagebus' |