diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-04 18:55:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-04 18:55:45 +0000 |
| commit | fc42dd2cef3f1e43af19f6455011cdd5d298aef5 (patch) | |
| tree | f5604c240760acc36eecda64e2f94fcd088a0409 /config/environment.rb | |
| parent | 5d0b53544c859506cc7f2e52f0a5243e50bca5e9 (diff) | |
| download | redmine-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/environment.rb')
| -rw-r--r-- | config/environment.rb | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/config/environment.rb b/config/environment.rb index b0f16c3e1..9a3bf4b1d 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -49,25 +49,9 @@ Rails::Initializer.run do |config| # Use Active Record's schema dumper instead of SQL when creating the test database # (enables use of different database adapters for development and test environments) # config.active_record.schema_format = :ruby - - # See Rails::Configuration for more options - # SMTP server configuration - config.action_mailer.smtp_settings = { - :address => "127.0.0.1", - :port => 25, - :domain => "somenet.foo", - :authentication => :login, - :user_name => "redmine@somenet.foo", - :password => "redmine", - } - - config.action_mailer.perform_deliveries = true - - # Tell ActionMailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - #config.action_mailer.delivery_method = :test - config.action_mailer.delivery_method = :smtp - + # Deliveries are disabled by default. Do NOT modify this section. + # Define your email configuration in email.yml instead. + # It will automatically turn deliveries on + config.action_mailer.perform_deliveries = false end |