aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config/environments/development.rb35
3 files changed, 17 insertions, 22 deletions
diff --git a/Gemfile b/Gemfile
index 08e104698..588585cfb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,6 +135,7 @@ group :development do
gem 'guard-rspec'
gem 'rails-erd'
gem 'meta_request'
+ gem 'letter_opener'
end
group :test, :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index cb4e8eae3..6ea37de56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,6 +220,8 @@ GEM
launchy (2.4.3-java)
addressable (~> 2.3)
spoon (~> 0.0.1)
+ letter_opener (1.3.0)
+ launchy (~> 2.2)
libv8 (3.3.10.4)
listen (2.8.6)
celluloid (>= 0.15.2)
@@ -500,6 +502,7 @@ DEPENDENCIES
json
language_engine (= 0.0.6)
launchy
+ letter_opener
map_layers (= 0.0.4)
meta_request
modernizr-rails (~> 2.0.6)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d0a554e63..0cd0d21de 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +1,6 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- config.eager_load = false
-
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
@@ -39,44 +37,37 @@ Rails.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
+
+ config.action_mailer.delivery_method = :letter_opener
# 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"
-
+
+ # Configure the e-mail address which will be shown in Devise::Mailer
+ config.mailer_sender = "appli@chouette.mobi"
+ config.to_prepare do
+ Devise::Mailer.layout "mailer"
+ end
+
# Specific theme for each company
# AFIMB
- config.company_name = "afimb"
+ config.company_name = "afimb"
config.company_theme = "#61970b" # AFIMB color
config.company_contact = "http://www.chouette.mobi/contact-support/"
config.accept_user_creation = true
-
+
# CITYWAY
# config.company_name = "cityway"
# config.company_theme = "#32adb0"
# config.company_contact = "http://www.cityway.fr/contact/?rub_code=14"
# config.accept_user_creation = false
-
+
# file to data for demo
config.demo_data = "tmp/demo.zip"
-
+
# 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::Mailer
- config.mailer_sender = "appli@chouette.mobi"
-
- 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"
-
- config.to_prepare do
- Devise::Mailer.layout "mailer"
- end
-
config.i18n.available_locales = [:fr, :en]
end