diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-08-03 15:24:26 +0200 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-12 17:17:30 -0700 |
| commit | 399056ed783e12337a9c47b06b4aae021198f1cd (patch) | |
| tree | 21645fa92b300735c5431608e17f3e34b34ce653 /spec/lib/gitlab/conflict | |
| parent | a5ecb5bbdac05c3b1a96ecb918ce6a4ceed37d75 (diff) | |
| download | gitlab-ce-399056ed783e12337a9c47b06b4aae021198f1cd.tar.gz | |
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 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 1bd077ddbdf..a955ce54e85 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -267,11 +267,6 @@ FILE it 'includes the full content of the conflict' do expect(conflict_file.as_json(full_content: true)).to have_key(:content) end - - it 'includes the detected language of the conflict file' do - expect(conflict_file.as_json(full_content: true)[:blob_ace_mode]) - .to eq('ruby') - end end end end |