diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:35 +0300 |
| commit | 6315ed9630fb1c6ade3114beb762cd1568d79219 (patch) | |
| tree | 2a5d31936d09c14420c8f4c8bd752e268f0eb19f /lib/gitlab/diff | |
| parent | fedf978f9aa1909ed7bb3fad767ad120a1c6bd7b (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 | 6 |
1 files changed, 1 insertions, 5 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 d27da186de0..d126fdb2be2 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff_base.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff_base.rb @@ -47,11 +47,7 @@ module Gitlab private def cache - @cache ||= if Feature.enabled?(:hset_redis_diff_caching, project, default_enabled: true) - Gitlab::Diff::HighlightCache.new(self) - else - Gitlab::Diff::DeprecatedHighlightCache.new(self) - end + @cache ||= Gitlab::Diff::HighlightCache.new(self) end end end |