Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/mailers/application_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

class ApplicationMailer < ActionMailer::Base
default from: '[email protected]'
default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
layout 'mailer'
end
2 changes: 1 addition & 1 deletion app/mailers/notifier_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class NotifierMailer < ApplicationMailer
# include NotificationsHelper
default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"

def verifier
unless ENV['RAILS_SECRET_TOKEN']
Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ class Application < Rails::Application

# Growstuff-specific configuration variables
config.currency = 'AUD'
config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
config.bot_email = Rails.configuration.x.email[:from]
config.user_agent = 'Growstuff'
config.user_agent_email = "[email protected]"
config.user_agent_email = Rails.configuration.x.email[:from]

Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
# API key can't be blank or tests fail
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
config.mailer_sender = "Growstuff <#{Rails.configuration.x.email[:from]}>"

config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)

Expand Down
9 changes: 9 additions & 0 deletions config/initializers/email.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module Growstuff
class Application < Rails::Application
config.x.email = {
from: ENV.fetch('GROWSTUFF_EMAIL', '[email protected]'),
admin: ENV.fetch('GROWSTUFF_ADMIN_EMAIL', '[email protected]'),
support: ENV.fetch('GROWSTUFF_SUPPORT_EMAIL', '[email protected]')
}
end
end
Loading