summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2019-01-15 22:05:36 +0100
committerJasper Maes <jaspermaes.jm@gmail.com>2019-01-16 22:36:01 +0100
commit4724afa0059803b9ada7f1f888fb5595767ae7aa (patch)
treed4bb5ca244e647d2ff6afc0b58c2041077b59928 /config
parentc46b8e968ba926745418738cb8855f0ca23b97cd (diff)
downloadgitlab-ce-4724afa0059803b9ada7f1f888fb5595767ae7aa.tar.gz
Actually set raise_on_unfiltered_parameters to true
Diffstat (limited to 'config')
-rw-r--r--config/application.rb3
-rw-r--r--config/initializers/new_framework_defaults.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index 349c7258852..92a3d031c63 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -162,6 +162,9 @@ module Gitlab
config.action_view.sanitized_allowed_protocols = %w(smb)
+ # Can be removed once upgraded to Rails 5.1 or higher
+ config.action_controller.raise_on_unfiltered_parameters = true
+
# Nokogiri is significantly faster and uses less memory than REXML
ActiveSupport::XmlMini.backend = 'Nokogiri'
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index a1e0667bc6f..115ee08dbb6 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -8,8 +8,6 @@
#
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
-
# Enable per-form CSRF tokens. Previous versions had false.
Rails.application.config.action_controller.per_form_csrf_tokens = false