diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-22 15:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-22 15:10:04 +0300 |
| commit | cb8bd7d5946ca50a2de99645687a633a0c8105be (patch) | |
| tree | a327e4da74f2a2d050a6971e0e03d41e5b0c5780 /lib/gitlab/json_cache.rb | |
| parent | 8e0dafbb6665d431f7f1b635c0f7c4a5c61bc325 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json_cache.rb')
| -rw-r--r-- | lib/gitlab/json_cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb index 4314c131ada..41c18f82a4b 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.to_s) + value = Gitlab::Json.parse(raw.to_s) case value when Hash then parse_entry(value, klass) @@ -66,7 +66,7 @@ module Gitlab else value end - rescue ActiveSupport::JSON.parse_error + rescue JSON::ParserError nil end |