summaryrefslogtreecommitdiffstats
path: root/app/controllers/settings_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-04 18:55:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-04 18:55:45 +0000
commitfc42dd2cef3f1e43af19f6455011cdd5d298aef5 (patch)
treef5604c240760acc36eecda64e2f94fcd088a0409 /app/controllers/settings_controller.rb
parent5d0b53544c859506cc7f2e52f0a5243e50bca5e9 (diff)
downloadredmine-fc42dd2cef3f1e43af19f6455011cdd5d298aef5.tar.gz
redmine-fc42dd2cef3f1e43af19f6455011cdd5d298aef5.zip
Email delivery configuration moved to an unversioned YAML file (config/email.yml, see the sample file) (#1412).
Email delivery is disabled. It's automatically turned on when configuration is found. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1625 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/settings_controller.rb')
-rw-r--r--app/controllers/settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index c7c8751dd..59b9c67e1 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -39,6 +39,7 @@ class SettingsController < ApplicationController
end
@options = {}
@options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
+ @deliveries = ActionMailer::Base.perform_deliveries
end
def plugin