nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'MrZYX/396-smtp-sender-address'

Browse source
This commit is contained in:
Raphael 2010-11-04 16:47:57 -07:00
commit c3a38eaab4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/app_config.yml.example
View file

@ -18,6 +18,7 @@ default:
smtp_port: '587' smtp_port: '587'
smtp_domain: 'mail.example.com' smtp_domain: 'mail.example.com'
smtp_authentication: 'plain' smtp_authentication: 'plain'
smtp_sender_address: 'no-reply@example.com'
smtp_username: 'no-reply@example.com' smtp_username: 'no-reply@example.com'
smtp_password: 'secret' smtp_password: 'secret'

2
config/initializers/devise.rb
View file

@ -6,7 +6,7 @@
# four configuration values can also be set straight in your models. # four configuration values can also be set straight in your models.
Devise.setup do |config| Devise.setup do |config|
# Configure the e-mail address which will be shown in DeviseMailer. # Configure the e-mail address which will be shown in DeviseMailer.
config.mailer_sender = "please-change-me@config-initializers-devise.com" config.mailer_sender = APP_CONFIG[:smtp_sender_address]
# ==> ORM configuration # ==> ORM configuration
# Load and configure the ORM. Supports :active_record (default), :mongoid # Load and configure the ORM. Supports :active_record (default), :mongoid