diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/gitlab/highlight.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'lib/gitlab/highlight.rb')
| -rw-r--r-- | lib/gitlab/highlight.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb index afe1554aec1..f830af68e07 100644 --- a/lib/gitlab/highlight.rb +++ b/lib/gitlab/highlight.rb @@ -50,11 +50,7 @@ module Gitlab attr_reader :context def self.file_size_limit - if Feature.enabled?(:one_megabyte_file_size_limit) - 1024.kilobytes - else - Gitlab.config.extra['maximum_text_highlight_size_kilobytes'] - end + Gitlab.config.extra['maximum_text_highlight_size_kilobytes'] end private_class_method :file_size_limit |