[refs #652] set url options for mailer
This commit is contained in:
parent
3c70adba9a
commit
eaf71f9cc0
|
@ -4,6 +4,7 @@ class FeedbackMailer < ActionMailer::Base
|
||||||
default :to => FBM_CONFIG['email'],
|
default :to => FBM_CONFIG['email'],
|
||||||
:cc => FBM_CONFIG['cc'],
|
:cc => FBM_CONFIG['cc'],
|
||||||
:bcc => FBM_CONFIG['bcc']
|
:bcc => FBM_CONFIG['bcc']
|
||||||
|
default_url_options.merge!(:protocol => 'https') if APP_CONFIG['mailer_https_url']
|
||||||
|
|
||||||
include Resque::Mailer # send email async
|
include Resque::Mailer # send email async
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
class UserMailer < ActionMailer::Base
|
class UserMailer < ActionMailer::Base
|
||||||
default :from => APP_CONFIG['do-not-reply-email']
|
default :from => APP_CONFIG['do-not-reply-email']
|
||||||
|
default_url_options.merge!(:protocol => 'https') if APP_CONFIG['mailer_https_url']
|
||||||
|
|
||||||
include Resque::Mailer # send email async
|
include Resque::Mailer # send email async
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue