diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 18:09:38 +0000 |
| commit | 028bb5dda7abc9ec76f21ae8e691825b4673f733 (patch) | |
| tree | a41741811452f928c6f650451c69fc18e46b62a4 /spec/controllers/projects/artifacts_controller_spec.rb | |
| parent | 7f305b576b51c3503970ef224cf4b31e247a322d (diff) | |
| download | gitlab-ce-028bb5dda7abc9ec76f21ae8e691825b4673f733.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/artifacts_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/artifacts_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb index c59983d5138..aa3371f7ddf 100644 --- a/spec/controllers/projects/artifacts_controller_spec.rb +++ b/spec/controllers/projects/artifacts_controller_spec.rb @@ -334,7 +334,7 @@ describe Projects::ArtifactsController do def params @params ||= begin base64_params = send_data.sub(/\Aartifacts\-entry:/, '') - JSON.parse(Base64.urlsafe_decode64(base64_params)) + Gitlab::Json.parse(Base64.urlsafe_decode64(base64_params)) end end end |