consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1323 from ferblape/1322-fix-initializer

Browse Source 
Don't fetch setting in dev mode
This commit is contained in:
Juanjo Bazán
2017-01-04 14:50:01 +01:00
committed by GitHub
parent 465a93f49c 8350143496
commit 6e5492de22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/devise.rb
View File

@@ -12,8 +12,8 @@ Devise.setup do |config|
# Configure the e-mail address which will be shown in Devise::Mailer, # 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 # note that it will be overwritten if you use your own mailer class
# with default "from" parameter. # with default "from" parameter.
if Rails.env.test? if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings')
config.mailer_sender = "noreply@example.org" config.mailer_sender = "noreply@consul.dev"
else else
config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>" config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
end end