diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-20 12:00:51 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-25 16:24:34 +0000 |
| commit | 394a39f82c8063b7c1660faa291200c3d15b783f (patch) | |
| tree | be81a1f13ea8bdb4bd4da6014cd27676d0909619 /lib | |
| parent | aec887ab85353f16e987846dc1012bd3ae303f06 (diff) | |
| download | gitlab-ce-394a39f82c8063b7c1660faa291200c3d15b783f.tar.gz | |
Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'master'
Gitlab::JsonCache#parse_value ensure string
Closes #63510
See merge request gitlab-org/gitlab-ce!29885
(cherry picked from commit 788690304a495aa6c4d3e2fa163753f28fbdb82f)
03220c00 Gitlab::JsonCache#parse_value ensure string
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/json_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb index e4bc437d787..9a0b2b35112 100644 --- a/lib/gitlab/json_cache.rb +++ b/lib/gitlab/json_cache.rb @@ -58,7 +58,7 @@ module Gitlab private def parse_value(raw, klass) - value = ActiveSupport::JSON.decode(raw) + value = ActiveSupport::JSON.decode(raw.to_s) case value when Hash then parse_entry(value, klass) |