summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-01-23 10:22:00 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-01-23 10:22:00 +0000
commit4cefae0aaadfadae71d695b17468fca2dfe74541 (patch)
treeaeceb744a0d9c38c17f0408d953baf614497bf6a /app/models/mailer.rb
parente173f7e72dff82dfe55656a0ea0b7cf25f0c45de (diff)
downloadredmine-4cefae0aaadfadae71d695b17468fca2dfe74541.tar.gz
redmine-4cefae0aaadfadae71d695b17468fca2dfe74541.zip
Adds an application configuration file: config/configuration.yml (#7408).
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e88e740a1..2d18a2c76 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -296,7 +296,7 @@ class Mailer < ActionMailer::Base
if raise_errors
raise e
elsif mylogger
- mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/email.yml."
+ mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/configuration.yml."
end
ensure
self.class.raise_delivery_errors = raise_errors