diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 10:26:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 10:26:13 +0000 |
| commit | 4588bbc93a7857eb2d031a4f3e0212c0aa46b846 (patch) | |
| tree | 1c1c9795491b5e6a97a5e8b5f00e4e2dcc99e5a1 /lib/api | |
| parent | 8236147d0fcb9f4f8c315f895aebc0c8158e2f7d (diff) | |
| download | gitlab-ce-4588bbc93a7857eb2d031a4f3e0212c0aa46b846.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/helpers/packages/conan/api_helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers/packages/conan/api_helpers.rb b/lib/api/helpers/packages/conan/api_helpers.rb index c9c2f66ef62..1161d1386bb 100644 --- a/lib/api/helpers/packages/conan/api_helpers.rb +++ b/lib/api/helpers/packages/conan/api_helpers.rb @@ -139,7 +139,7 @@ module API end def file_names - json_payload = Gitlab::Json.parse(request.body.string) + json_payload = Gitlab::Json.parse(request.body.read) bad_request!(nil) unless json_payload.is_a?(Hash) |