Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00
parent bcf7ee48e9 056b5ed72f
commit 79d898ae0a
340 changed files with 4980 additions and 2321 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -73,6 +73,8 @@ Rails.application.configure do
  config.action_mailer.perform_caching = false

  # E-mails
+  config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') }
+
  config.action_mailer.smtp_settings = {
    :port                 => ENV['SMTP_PORT'],
    :address              => ENV['SMTP_SERVER'],