lets see if this fixes #1337
This commit is contained in:
parent
52c75a7ad4
commit
4a260056c0
1 changed files with 1 additions and 0 deletions
|
|
@ -6,6 +6,7 @@ require File.join(Rails.root, 'lib/messagebus/mailer')
|
||||||
Diaspora::Application.configure do
|
Diaspora::Application.configure do
|
||||||
config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme,
|
config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme,
|
||||||
:host => AppConfig[:pod_uri].authority }
|
:host => AppConfig[:pod_uri].authority }
|
||||||
|
config.action_mailer.asset_host = AppConfig[:pod_uri].to_s
|
||||||
|
|
||||||
unless Rails.env == 'test' || AppConfig[:mailer_on] != true
|
unless Rails.env == 'test' || AppConfig[:mailer_on] != true
|
||||||
if AppConfig[:mailer_method] == 'messagebus'
|
if AppConfig[:mailer_method] == 'messagebus'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue