diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-14 07:06:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-14 07:06:26 +0000 |
| commit | 001602b8a824fc28f81eede641ad289f867cb98f (patch) | |
| tree | 76947622ea7604b0571f01cfd9b470bb15be6623 | |
| parent | 8e0697dae375266ee9eaff3dfc4e892f2bd365cb (diff) | |
| parent | 876d43b9f5ba54b4f572f4b28ea55cef82cc74ea (diff) | |
| download | gitlab-ce-001602b8a824fc28f81eede641ad289f867cb98f.tar.gz | |
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
| -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) |