diff options
| author | Michel Etienne | 2012-07-06 09:21:47 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-07-06 09:21:47 +0200 |
| commit | 57f96c8fbeda9cc50b8167cc23ea703900b75de5 (patch) | |
| tree | a7141b950dd18d95a9e6c83c72414bf72ccbcf56 /config | |
| parent | 8052f392196759cfd5f86419cf84528e8f0c1ab1 (diff) | |
| parent | b42faea683ab4a1ce19fda87b03662983b896dac (diff) | |
| download | chouette-core-57f96c8fbeda9cc50b8167cc23ea703900b75de5.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 2 | ||||
| -rw-r--r-- | config/environments/development.rb | 4 | ||||
| -rw-r--r-- | config/environments/test.rb | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/config/database.yml b/config/database.yml index 599c581da..0c5c4ba6e 100644 --- a/config/database.yml +++ b/config/database.yml @@ -22,7 +22,7 @@ test: password: chouette production: - adapter: jdbcpostgresql + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: chouette2 encoding: utf8 host: localhost diff --git a/config/environments/development.rb b/config/environments/development.rb index 73606fc10..f4936039b 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -28,6 +28,10 @@ ChouetteIhm::Application.configure do # Expands the lines which load the assets config.assets.debug = false + config.active_record.mass_assignment_sanitizer = :strict + + config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) + config.action_mailer.default_url_options = { :host => 'localhost:3000' } config.to_prepare do diff --git a/config/environments/test.rb b/config/environments/test.rb index b2c29057b..2d2e45717 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -24,6 +24,9 @@ ChouetteIhm::Application.configure do # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false +# Raise exception on mass assignment protection for Active Record models + config.active_record.mass_assignment_sanitizer = :strict + # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. |