diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 32f387ba9..b947a5468 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -12,7 +12,7 @@ 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? + if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings') config.mailer_sender = "noreply@example.org" else config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"