Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/json_cache.rb')
-rw-r--r--lib/gitlab/json_cache.rb4
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