summaryrefslogtreecommitdiffstats
path: root/config/environments
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 /config/environments
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 'config/environments')
-rw-r--r--config/environments/test.rb1
-rw-r--r--config/environments/test_pgsql.rb3
-rw-r--r--config/environments/test_sqlite3.rb3
3 files changed, 5 insertions, 2 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9ba9ae0f8..7c821da07 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,4 +13,5 @@ config.whiny_nils = true
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
+config.action_mailer.perform_deliveries = true
config.action_mailer.delivery_method = :test
diff --git a/config/environments/test_pgsql.rb b/config/environments/test_pgsql.rb
index 35bb19bee..7c821da07 100644
--- a/config/environments/test_pgsql.rb
+++ b/config/environments/test_pgsql.rb
@@ -13,4 +13,5 @@ config.whiny_nils = true
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
-config.action_mailer.delivery_method = :test \ No newline at end of file
+config.action_mailer.perform_deliveries = true
+config.action_mailer.delivery_method = :test
diff --git a/config/environments/test_sqlite3.rb b/config/environments/test_sqlite3.rb
index 35bb19bee..7c821da07 100644
--- a/config/environments/test_sqlite3.rb
+++ b/config/environments/test_sqlite3.rb
@@ -13,4 +13,5 @@ config.whiny_nils = true
config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = false
-config.action_mailer.delivery_method = :test \ No newline at end of file
+config.action_mailer.perform_deliveries = true
+config.action_mailer.delivery_method = :test