diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-08-03 16:24:26 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-13 03:17:30 +0300 |
| commit | 399056ed783e12337a9c47b06b4aae021198f1cd (patch) | |
| tree | 21645fa92b300735c5431608e17f3e34b34ce653 /lib/gitlab/conflict | |
| parent | a5ecb5bbdac05c3b1a96ecb918ce6a4ceed37d75 (diff) | |
Remove dependencies on Linguist
This saves about 128 MB of baseline RAM usage per Unicorn and
Sidekiq process (!).
Linguist wasn't detecting languages anymore from CE/EE since
9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper
was still being depended on by BlobLike and others.
This removes the Linguist gem, given it isn't required anymore.
EscapeUtils were pulled in as dependency, but given Banzai depends on
it, it is now added explicitly.
Previously, Linguist was used to detect the best ACE mode. Instead,
we rely on ACE to guess the best mode based on the file extension.
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 2a0cb640a14..30911b49b18 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -158,7 +158,6 @@ module Gitlab json_hash.tap do |json_hash| if opts[:full_content] json_hash[:content] = content - json_hash[:blob_ace_mode] = our_blob && our_blob.language.try(:ace_mode) else json_hash[:sections] = sections if type.text? json_hash[:type] = type |