diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 15:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 15:08:32 +0300 |
| commit | c158fa8d69c704663d289341a014c44c062cda88 (patch) | |
| tree | d0cac82a9ac9e9ad28bb0030266eb8d5dc91fbbc /lib/gitlab/diff | |
| parent | b806264d29b8d52ccb78a41dcc3d67f2b040700c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb index 06cf3d4d168..d27da186de0 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb @@ -47,7 +47,7 @@ module Gitlab private def cache - @cache ||= if Feature.enabled?(:hset_redis_diff_caching, project) + @cache ||= if Feature.enabled?(:hset_redis_diff_caching, project, default_enabled: true) Gitlab::Diff::HighlightCache.new(self) else Gitlab::Diff::DeprecatedHighlightCache.new(self) |