diff options
| author | Zakaria BOUZIANE | 2015-02-12 17:43:04 +0100 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2015-02-12 17:43:04 +0100 |
| commit | 29392c158b887733754d0b4e8dc3bad7ba8bcefe (patch) | |
| tree | aada6a24c7b56717153002d98c7a08971ea84ad9 | |
| parent | 81faf7a52b122948c40b0e06fda9249d164a1852 (diff) | |
| parent | 38a62982df16d8644db4474887b4c5fbd832dfe2 (diff) | |
| download | chouette-core-29392c158b887733754d0b4e8dc3bad7ba8bcefe.tar.bz2 | |
Merge branch 'V2_5' of https://github.com/afimb/chouette2 into V2_5
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | config/environments/development.rb | 10 |
2 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,4 @@ -# Chouette2 [](http://travis-ci.org/afimb/chouette2?branch=master) [](https://gemnasium.com/afimb/chouette2) [](https://codeclimate.com/github/afimb/chouette2) +# Chouette2 [](https://travis-ci.org/afimb/chouette2) [](https://gemnasium.com/afimb/chouette2) [](https://codeclimate.com/github/afimb/chouette2) Chouette2 is an open source web project in Ruby/Rails to edit and view transport offer. It's designed as an [SaaS](http://en.wikipedia.org/wiki/Software_as_a_service) platform and can : * Exchange transport data : [Neptune](http://www.chouette.mobi/spip.php?rubrique61), [GTFS](https://developers.google.com/transit/gtfs/reference?hl=fr), [NeTEx](http://www.kizoom.com/standards/netex/), CSV diff --git a/config/environments/development.rb b/config/environments/development.rb index 3d7819639..26f909c23 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,6 +40,12 @@ ChouetteIhm::Application.configure do config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) config.action_mailer.default_url_options = { :host => 'localhost:3000' } + + config.action_mailer.delivery_method = :sendmail + # change to true to allow email to be sent during development + config.action_mailer.perform_deliveries = true + config.action_mailer.raise_delivery_errors = true + config.action_mailer.default :charset => "utf-8" # replace this with your production tracker code GA.tracker = "UA-AAAAAAAA" @@ -66,10 +72,10 @@ ChouetteIhm::Application.configure do # link to validation specification pages config.validation_spec = "http://www.chouette.mobi/neptune-validation/v20/" - # Configure the e-mail address which will be shown in Devise::Maile + # Configure the e-mail address which will be shown in Devise::Mailer config.mailer_sender = "appli@chouette.mobi" - config.action_mailer.delivery_method = :sendmail + config.action_mailer.delivery_method = :sendmail # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true |