diff options
| author | Toon Claes <toon@gitlab.com> | 2022-06-22 21:44:17 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-07-08 11:24:17 +0300 |
| commit | a5dc2fc6182e7ea0c6f8ecd17985ef37ef317a32 (patch) | |
| tree | 9ff7442e0fb3ea15d84cb29ab97f52f8e7bd0fde | |
| parent | 181a7d79de8c1fd0385baf7d114cbad6c417d639 (diff) | |
Gemfile: Update github-linguist gem
The go-enry package is based of github-linguist v7.20.0. To be able to
compare the set of languages they both know, we update the Gem to match
the version where the go package got the mustard from.
| -rw-r--r-- | internal/gitaly/service/commit/languages_test.go | 4 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index a36fea35b..731f950cd 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -43,9 +43,7 @@ func testLanguagesFeatured(t *testing.T, ctx context.Context) { {Name: "JavaScript", Share: 22.493345, Color: "#f1e05a", Bytes: 1014}, {Name: "HTML", Share: 7.741792, Color: "#e34c26", Bytes: 349}, {Name: "CoffeeScript", Share: 2.373558, Color: "#244776", Bytes: 107}, - // Modula-2 is a special case because Linguist has no color for it. This - // test case asserts that we invent a color for it (SHA256 of the name). - {Name: "Modula-2", Share: 2.1073646, Color: "#3fd5e0", Bytes: 95}, + {Name: "Modula-2", Share: 2.1073646, Color: "#10253f", Bytes: 95}, } testhelper.ProtoEqual(t, expectedLanguages, resp.Languages) diff --git a/ruby/Gemfile b/ruby/Gemfile index 7037e215f..cbb9321fd 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' -gem 'github-linguist', '~> 7.12', require: 'linguist' +gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.4.7' gem 'rdoc', '~> 6.0' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index f8688dbb5..65faf2b72 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -40,7 +40,7 @@ GEM dotenv (2.7.6) equalizer (0.0.11) erubi (1.10.0) - escape_utils (1.2.1) + escape_utils (1.2.2) factory_bot (5.0.2) activesupport (>= 4.2.0) faraday (1.0.1) @@ -48,11 +48,11 @@ GEM ffi (1.15.3) gemojione (3.3.0) json - github-linguist (7.12.1) + github-linguist (7.20.0) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) - rugged (>= 0.25.1) + rugged (~> 1.0) github-markup (1.7.0) gitlab-gollum-lib (4.2.7.10.gitlab.2) gemojione (~> 3.2) @@ -110,7 +110,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) - mini_mime (1.0.2) + mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.3.3) @@ -228,7 +228,7 @@ DEPENDENCIES activesupport (~> 6.1.4.7) factory_bot faraday (~> 1.0) - github-linguist (~> 7.12) + github-linguist (~> 7.20.0) gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) gitlab-labkit (~> 0.23) |