diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-03-05 18:52:01 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-03-05 18:52:01 +0300 |
| commit | 37c8b66e3ad87e68d18c677f0155fc01c8e6d4cb (patch) | |
| tree | c1f97c4d18c3a98b7e5b9691d90ad379a24524c5 | |
| parent | 0138a4a26952f3ece3bf669ec5315a66f2903637 (diff) | |
| parent | 48049bce08ded2abbc234257af7523759975409e (diff) | |
Merge branch 'linguist-5.3.x' into 'master'
Bump github-linguist to 5.3.3
See merge request gitlab-org/gitaly!613
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | internal/service/commit/languages_test.go | 4 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
4 files changed, 12 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b05cfe936..f367e2e28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Gitaly changelog +UNRELEASED + +- Bump github-linguist to 5.3.3 + https://gitlab.com/gitlab-org/gitaly/merge_requests/613 + v0.88.0 - Add support for all field to {Find,Count}Commits RPCs diff --git a/internal/service/commit/languages_test.go b/internal/service/commit/languages_test.go index 347290c67..0deeb7ca0 100644 --- a/internal/service/commit/languages_test.go +++ b/internal/service/commit/languages_test.go @@ -35,7 +35,7 @@ func TestLanguages(t *testing.T) { expectedLanguages := []pb.CommitLanguagesResponse_Language{ {Name: "Ruby", Share: 66, Color: "#701516"}, {Name: "JavaScript", Share: 22, Color: "#f1e05a"}, - {Name: "HTML", Share: 7, Color: "#e44b23"}, + {Name: "HTML", Share: 7, Color: "#e34c26"}, {Name: "CoffeeScript", Share: 2, Color: "#244776"}, // 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). @@ -46,7 +46,7 @@ func TestLanguages(t *testing.T) { for i, el := range expectedLanguages { actualLanguage := resp.Languages[i] - require.True(t, languageEqual(&el, actualLanguage), "language %+v not equal to %+v", el, *actualLanguage) + require.True(t, languageEqual(&el, actualLanguage), "expected %+v, got %+v", el, *actualLanguage) } } diff --git a/ruby/Gemfile b/ruby/Gemfile index c431c7149..ff40ab8c8 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' gem 'gitaly-proto', '~> 0.88.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index d31e96676..8ee70d965 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -20,11 +20,11 @@ GEM gitaly-proto (0.88.0) google-protobuf (~> 3.1) grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) @@ -142,7 +142,7 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) gitaly-proto (~> 0.88.0) - github-linguist (~> 4.7.0) + github-linguist (~> 5.3.3) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) |