summaryrefslogtreecommitdiff
path: root/lib/gitlab/discussions_diff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /lib/gitlab/discussions_diff
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
downloadgitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'lib/gitlab/discussions_diff')
-rw-r--r--lib/gitlab/discussions_diff/highlight_cache.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/discussions_diff/highlight_cache.rb b/lib/gitlab/discussions_diff/highlight_cache.rb
index 4bec6467c1a..3337aeb9262 100644
--- a/lib/gitlab/discussions_diff/highlight_cache.rb
+++ b/lib/gitlab/discussions_diff/highlight_cache.rb
@@ -3,6 +3,8 @@
module Gitlab
module DiscussionsDiff
class HighlightCache
+ extend Gitlab::Utils::Gzip
+
class << self
VERSION = 1
EXPIRATION = 1.week
@@ -17,7 +19,7 @@ module Gitlab
mapping.each do |raw_key, value|
key = cache_key_for(raw_key)
- multi.set(key, value.to_json, ex: EXPIRATION)
+ multi.set(key, gzip_compress(value.to_json), ex: EXPIRATION)
end
end
end
@@ -44,7 +46,7 @@ module Gitlab
content.map! do |lines|
next unless lines
- Gitlab::Json.parse(lines).map! do |line|
+ Gitlab::Json.parse(gzip_decompress(lines)).map! do |line|
Gitlab::Diff::Line.safe_init_from_hash(line)
end
end