Merge pull request #1323 from ferblape/1322-fix-initializer
Don't fetch setting in dev mode
This commit is contained in:
@@ -12,8 +12,8 @@ Devise.setup do |config|
|
||||
# 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.
|
||||
if Rails.env.test?
|
||||
config.mailer_sender = "noreply@example.org"
|
||||
if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings')
|
||||
config.mailer_sender = "noreply@consul.dev"
|
||||
else
|
||||
config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user