diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-13 22:37:41 +0200 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-13 23:49:44 +0200 |
commit | 876d43b9f5ba54b4f572f4b28ea55cef82cc74ea (patch) | |
tree | c24fa75cb2f5a38f8ef521adb6ce905f6811aa02 | |
parent | 7cf571e95550b3c14eb971ea165a8930b809e1d7 (diff) | |
download | gitlab-ce-876d43b9f5ba54b4f572f4b28ea55cef82cc74ea.tar.gz |
Rails5 fix no implicit conversion of Hash into String. ActionController::Parameters no longer returns an hash in Rails 5
-rw-r--r-- | changelogs/unreleased/rails5-fix-47835.yml | 6 | ||||
-rw-r--r-- | lib/api/helpers.rb | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/rails5-fix-47835.yml b/changelogs/unreleased/rails5-fix-47835.yml new file mode 100644 index 00000000000..fe9cbf1a03a --- /dev/null +++ b/changelogs/unreleased/rails5-fix-47835.yml @@ -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 diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 2ed331d4fd2..9c53b7c3fe7 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -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) |