Commit 001602b8 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-47835' into 'master'

Rails5 fix no implicit conversion of Hash into String

Closes #47835

See merge request gitlab-org/gitlab-ce!19792
parents 8e0697da 876d43b9
---
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
...@@ -272,7 +272,8 @@ module API ...@@ -272,7 +272,8 @@ module API
attrs[key] = params_hash[key] attrs[key] = params_hash[key]
end end
end end
ActionController::Parameters.new(attrs).permit! permitted_attrs = ActionController::Parameters.new(attrs).permit!
Gitlab.rails5? ? permitted_attrs.to_h : permitted_attrs
end end
def filter_by_iid(items, iid) def filter_by_iid(items, iid)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment