Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-01 21:10:20 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-01 21:10:20 +0300
commit0b4bb101eaea8ec7c26b5d4bccc3a5a565c721d4 (patch)
treecaa37c67e707c54227e679832fc7cba2583a3363 /app/helpers/safe_params_helper.rb
parent2d9c043ab8b576ed254a900cc57ce0bd763dfdcf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/safe_params_helper.rb')
-rw-r--r--app/helpers/safe_params_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/safe_params_helper.rb b/app/helpers/safe_params_helper.rb
index 72bf1377b02..e9f0d82bb27 100644
--- a/app/helpers/safe_params_helper.rb
+++ b/app/helpers/safe_params_helper.rb
@@ -5,7 +5,7 @@ module SafeParamsHelper
# Use this helper when generating links with `params.merge(...)`
def safe_params
if params.respond_to?(:permit!)
- params.except(:host, :port, :protocol).permit!
+ params.except(*ActionDispatch::Routing::RouteSet::RESERVED_OPTIONS).permit!
else
params
end