diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/gitlab/encoding_helper.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/gitlab/encoding_helper.rb')
-rw-r--r-- | lib/gitlab/encoding_helper.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb index 50e7631d983..2e0060c7c18 100644 --- a/lib/gitlab/encoding_helper.rb +++ b/lib/gitlab/encoding_helper.rb @@ -40,15 +40,7 @@ module Gitlab def detect_encoding(data, limit: CharlockHolmes::EncodingDetector::DEFAULT_BINARY_SCAN_LEN, cache_key: nil) return if data.nil? - if Feature.enabled?(:cached_encoding_detection, type: :development, default_enabled: :yaml) - return CharlockHolmes::EncodingDetector.new(limit).detect(data) unless cache_key.present? - - Rails.cache.fetch([:detect_binary, CharlockHolmes::VERSION, cache_key], expires_in: 1.week) do - CharlockHolmes::EncodingDetector.new(limit).detect(data) - end - else - CharlockHolmes::EncodingDetector.new(limit).detect(data) - end + CharlockHolmes::EncodingDetector.new(limit).detect(data) end def detect_binary?(data, detect = nil) |