| @@ -4,13 +4,3 @@ require File.expand_path('../application', __FILE__) | |||||
| # Initialize the rails application | # Initialize the rails application | ||||
| Apollo::Application.initialize! | Apollo::Application.initialize! | ||||
| # SendGrid config for Heroku Cedar stack | |||||
| ActionMailer::Base.smtp_settings = { | |||||
| :address => 'smtp.sendgrid.net', | |||||
| :port => '587', | |||||
| :authentication => :plain, | |||||
| :user_name => ENV['SENDGRID_USERNAME'], | |||||
| :password => ENV['SENDGRID_PASSWORD'], | |||||
| :domain => 'heroku.com', | |||||
| :enable_starttls_auto => true | |||||
| } | |||||
| @@ -1,6 +1,8 @@ | |||||
| Apollo::Application.configure do | Apollo::Application.configure do | ||||
| # Settings specified here will take precedence over those in config/application.rb | # Settings specified here will take precedence over those in config/application.rb | ||||
| config.action_mailer.default_url_options = { :host => 'localhost:3000' } | |||||
| # In the development environment your application's code is reloaded on | # In the development environment your application's code is reloaded on | ||||
| # every request. This slows down response time but is perfect for development | # every request. This slows down response time but is perfect for development | ||||
| # since you don't have to restart the web server when you make code changes. | # since you don't have to restart the web server when you make code changes. | ||||
| @@ -1,5 +1,18 @@ | |||||
| Apollo::Application.configure do | Apollo::Application.configure do | ||||
| # Settings specified here will take precedence over those in config/application.rb | # Settings specified here will take precedence over those in config/application.rb | ||||
| config.action_mailer.default_url_options = { :host => 'tal-apollo-staging.herokuapp.com' } | |||||
| # SendGrid config for Heroku Cedar stack | |||||
| ActionMailer::Base.smtp_settings = { | |||||
| :address => 'smtp.sendgrid.net', | |||||
| :port => '587', | |||||
| :authentication => :plain, | |||||
| :user_name => ENV['SENDGRID_USERNAME'], | |||||
| :password => ENV['SENDGRID_PASSWORD'], | |||||
| :domain => 'heroku.com', | |||||
| :enable_starttls_auto => true | |||||
| } | |||||
| # Code is not reloaded between requests | # Code is not reloaded between requests | ||||
| config.cache_classes = true | config.cache_classes = true | ||||