diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 03:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 03:09:59 +0300 |
| commit | 3795b229ab9d63846002ebb9b95073c3cbf5ab98 (patch) | |
| tree | cb407d4e4d2d6a1b2f1f3f5850dccfe423eed302 /lib/gitlab/workhorse.rb | |
| parent | 3aeda4e6146bea1920c3283e98b01ca4fcf796a8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index acec7cb30a6..75196a03edc 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -205,7 +205,7 @@ module Gitlab # This is the outermost encoding of a senddata: header. It is safe for # inclusion in HTTP response headers def encode(hash) - Base64.urlsafe_encode64(JSON.dump(hash)) + Base64.urlsafe_encode64(Gitlab::Json.dump(hash)) end # This is for encoding individual fields inside the senddata JSON that |