diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 08:17:16 +0100 |
commit | 17e2024962b84f759b1f2bfb13564d6626f0d6f0 (patch) | |
tree | 70c20452176bfce76ef5a34b698e6ac615f66c23 /config/environments/development.rb | |
parent | e3887f042ba1309985e58ce553de0de05227dc56 (diff) | |
parent | 19d6e36039318cdb1f9aa9e0c4731b500b3b0aeb (diff) |
Merge branch 'release/0.6.3' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/request/show.rhtml
spec/models/info_request_spec.rb
Diffstat (limited to 'config/environments/development.rb')
-rw-r--r-- | config/environments/development.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index f21f27ab6..f07fd31bf 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,6 +1,6 @@ # Settings specified here will take precedence over those in config/environment.rb -config.log_level = :info +config.log_level = :debug # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development @@ -17,8 +17,8 @@ config.action_view.debug_rjs = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false -config.action_mailer.perform_deliveries = false -config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors +config.action_mailer.perform_deliveries = true +config.action_mailer.delivery_method = :test # so is queued, rather than giving immediate errors # Writes useful log files to debug memory leaks, of the sort where have # unintentionally kept references to objects, especially strings. |