diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 00:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 00:09:24 +0300 |
| commit | 9432ed811233643af1cb5ad78e2cd9755ed989a9 (patch) | |
| tree | a6f4d254ebd818a58017b3bfb0911f4aae169fcf /lib/gitlab/diff | |
| parent | 44434461b3c58336624125b5ab002e7200e4a208 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/highlight_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb index d6f5e45c034..13e755bb27a 100644 --- a/lib/gitlab/diff/highlight_cache.rb +++ b/lib/gitlab/diff/highlight_cache.rb @@ -132,7 +132,7 @@ module Gitlab diff_file_id, gzip_compress(highlighted_diff_lines_hash.to_json) ) - rescue Encoding::UndefinedConversionError + rescue Encoding::UndefinedConversionError, EncodingError nil end |