summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-26 18:40:13 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-26 18:40:13 +0300
commitf86afb732b0842cc1e65e504a60016998385a3dc (patch)
tree64ece46bb29affe68cd90daf4ba464ce6b637c1b /config/environments
parentcb74c014ea6d27314143ffd4975717b1acee607a (diff)
downloadgitlab-ce-f86afb732b0842cc1e65e504a60016998385a3dc.tar.gz
Fix dev env. Fix MR creation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/development.rb3
-rw-r--r--config/environments/test.rb3
2 files changed, 0 insertions, 6 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e4c7649fda0..356e26bd68c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -19,9 +19,6 @@ Gitlab::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
-
# Do not compress assets
config.assets.compress = false
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 3860dc5c74c..25b082b98da 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -26,9 +26,6 @@ Gitlab::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