diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 03:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 03:10:15 +0300 |
| commit | 46aea02972d6caaf34a11689e9e6ccfa9dcb538a (patch) | |
| tree | 5e4e71724bdab97d6d3f57ed25e11e0c516383fb /lib/gitlab/diff/highlight_cache.rb | |
| parent | 83d921d51bd5bf8bd0ecd078706d7c037fb711cb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff/highlight_cache.rb')
| -rw-r--r-- | lib/gitlab/diff/highlight_cache.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb index 209462fd6e9..a792eafde79 100644 --- a/lib/gitlab/diff/highlight_cache.rb +++ b/lib/gitlab/diff/highlight_cache.rb @@ -74,7 +74,6 @@ module Gitlab diffable.cache_key, VERSION, diff_options, - Feature.enabled?(:introduce_marker_ranges, diffable.project, default_enabled: :yaml), Feature.enabled?(:use_marker_ranges, diffable.project, default_enabled: :yaml), Feature.enabled?(:diff_line_syntax_highlighting, diffable.project, default_enabled: :yaml) ].join(":") |