kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rails5 fix no implicit conversion of Hash into String. ActionController::Parameters no longer returns an hash in Rails 5

Browse source
This commit is contained in:
Jasper Maes 2018-06-13 22:37:41 +02:00
parent 7cf571e955
commit 876d43b9f5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelogs/unreleased/rails5-fix-47835.yml Normal file
View file

@ -0,0 +1,6 @@
---
title: Rails5 fix no implicit conversion of Hash into String. ActionController::Parameters
no longer returns an hash in Rails 5
merge_request: 19792
author: Jasper Maes
type: fixed

3
lib/api/helpers.rb
View file

@ -272,7 +272,8 @@ module API
attrs[key] = params_hash[key]
end
end
ActionController::Parameters.new(attrs).permit!
permitted_attrs = ActionController::Parameters.new(attrs).permit!
Gitlab.rails5? ? permitted_attrs.to_h : permitted_attrs
end
def filter_by_iid(items, iid)