diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-08 03:09:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-08 03:09:36 +0300 |
| commit | 5487465d35110ef72c2e7cea7ef031c3ddf4dcbc (patch) | |
| tree | 8f0b93358623fd03a912c4e6d373d1bc8aed6949 /lib/gitlab/json.rb | |
| parent | 2f8483621ea55d217f8ee92d22ba2ce0c250d0b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json.rb')
| -rw-r--r-- | lib/gitlab/json.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index 512936bb4f4..968b48b240f 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -95,7 +95,7 @@ module Gitlab opts = standardize_opts(opts) Oj.load(string, opts) - rescue Oj::ParseError, Encoding::UndefinedConversionError => ex + rescue Oj::ParseError, EncodingError, JSON::ParseError, Encoding::UndefinedConversionError => ex raise parser_error, ex end |