diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-23 10:22:00 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-01-23 10:22:00 +0000 |
commit | 4cefae0aaadfadae71d695b17468fca2dfe74541 (patch) | |
tree | aeceb744a0d9c38c17f0408d953baf614497bf6a /config/initializers | |
parent | e173f7e72dff82dfe55656a0ea0b7cf25f0c45de (diff) | |
download | redmine-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 'config/initializers')
-rw-r--r-- | config/initializers/40-email.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/config/initializers/40-email.rb b/config/initializers/40-email.rb deleted file mode 100644 index 5b388ec59..000000000 --- a/config/initializers/40-email.rb +++ /dev/null @@ -1,17 +0,0 @@ -# Loads action_mailer settings from email.yml -# and turns deliveries on if configuration file is found - -filename = File.join(File.dirname(__FILE__), '..', 'email.yml') -if File.file?(filename) - mailconfig = YAML::load_file(filename) - - if mailconfig.is_a?(Hash) && mailconfig.has_key?(Rails.env) - # Enable deliveries - ActionMailer::Base.perform_deliveries = true - - mailconfig[Rails.env].each do |k, v| - v.symbolize_keys! if v.respond_to?(:symbolize_keys!) - ActionMailer::Base.send("#{k}=", v) - end - end -end |