Merge branch 'master' into 0000-docker

1 files changed, 15 insertions, 1 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 56773d81e..446e72190 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -36,9 +36,10 @@ Rails.application.configure do
   # config.action_view.raise_on_missing_translations = true
   #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.default_url_options = { :host => ENV.fetch('RAILS_HOST', 'http://localhost:3000') }
   config.action_mailer.default_options     = { from: 'Stif BOIV <stif-boiv@af83.com>' }
   config.action_mailer.delivery_method     = :letter_opener
+  config.action_mailer.asset_host          = ENV.fetch('RAILS_HOST', 'http://localhost:3000')
 
   # change to true to allow email to be sent during development
   config.action_mailer.perform_deliveries = true
@@ -92,4 +93,17 @@ Rails.application.configure do
   config.validation_spec = "http://www.chouette.mobi/neptune-validation/v21/"
 
   config.i18n.available_locales = [:fr, :en]
+
+  config.middleware.insert_after(ActionDispatch::Static, Rack::LiveReload) if ENV['LIVERELOAD']
+  config.middleware.use I18n::JS::Middleware
+  config.development_toolbar = false
+  if ENV['TOOLBAR'] && File.exists?("config/development_toolbar.rb")
+    config.development_toolbar = OpenStruct.new
+    config.development_toolbar.features_doc_url = nil
+    config.development_toolbar.available_features = %w()
+    config.development_toolbar.available_permissions = %w()
+    config.development_toolbar.tap do |toolbar|
+      eval File.read("config/development_toolbar.rb")
+    end
+  end
 end