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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Raphael 2010-10-07 16:51:20 -07:00
commit 5008b75a44
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environments/development.rb
View file

@ -28,7 +28,7 @@ Diaspora::Application.configure do
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'} config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
:address => 'pivots.joindiaspora.com', :address => 'smtp.gmail.com',
:port => 587, :port => 587,
:domain => 'mail.joindiaspora.com', :domain => 'mail.joindiaspora.com',
:authentication => 'plain', :authentication => 'plain',

2
config/environments/production.rb
View file

@ -51,7 +51,7 @@ Diaspora::Application.configure do
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'} config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
:address => 'pivots.joindiaspora.com', :address => 'smtp.gmail.com',
:port => 587, :port => 587,
:domain => 'mail.joindiaspora.com', :domain => 'mail.joindiaspora.com',
:authentication => 'plain', :authentication => 'plain',