diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/gitlab/diff/highlight_cache.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/gitlab/diff/highlight_cache.rb')
-rw-r--r-- | lib/gitlab/diff/highlight_cache.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb index a792eafde79..075027ebdc8 100644 --- a/lib/gitlab/diff/highlight_cache.rb +++ b/lib/gitlab/diff/highlight_cache.rb @@ -132,6 +132,8 @@ module Gitlab diff_file_id, gzip_compress(highlighted_diff_lines_hash.to_json) ) + rescue Encoding::UndefinedConversionError + nil end # HSETs have to have their expiration date manually updated |