From 067576f6f480626b993e184ad3bd0705d381edba Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 15 Sep 2013 23:40:25 +0200 Subject: [PATCH] Moved to rails4 settings. --- config/environments/development.rb | 7 ------- config/environments/production.rb | 4 ---- config/environments/test.rb | 3 --- config/environments/test_mysql.rb | 3 --- 4 files changed, 17 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index c3c5b2862..14f3377f7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -19,13 +19,6 @@ Zammad::Application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - config.active_record.auto_explain_threshold_in_seconds = 0.5 - # Do not compress assets config.assets.compress = false diff --git a/config/environments/production.rb b/config/environments/production.rb index 4ecfb86e5..4c418a760 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -61,10 +61,6 @@ Zammad::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - # config.active_record.auto_explain_threshold_in_seconds = 0.5 - # autoload on config.dependency_loading = true end diff --git a/config/environments/test.rb b/config/environments/test.rb index 8e7ee2ef8..37bab79d2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -27,9 +27,6 @@ Zammad::Application.configure do # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict - # Print deprecation notices to the stderr config.active_support.deprecation = :stderr diff --git a/config/environments/test_mysql.rb b/config/environments/test_mysql.rb index 8e7ee2ef8..37bab79d2 100644 --- a/config/environments/test_mysql.rb +++ b/config/environments/test_mysql.rb @@ -27,9 +27,6 @@ Zammad::Application.configure do # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict - # Print deprecation notices to the stderr config.active_support.deprecation = :stderr