diff options
| author | Toon Claes <toon@gitlab.com> | 2020-09-28 10:48:27 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2020-09-28 10:48:27 +0300 |
| commit | 69c5d9bad86e9402d5e2b0d7c09e88fd5603b572 (patch) | |
| tree | daffd60438a1ed6fbd42bcba0d6b9c354431a323 | |
| parent | ef24c6113dc4fede161ceca0f8bebea56de6347c (diff) | |
| parent | 732407de15f9ba8e134f09d6728fb0111ec0a16b (diff) | |
Merge branch 'zj-bump-linguist' into 'master'
linguist: Bump version for better detection
Closes gitlab#254682
See merge request gitlab-org/gitaly!2591
| -rw-r--r-- | changelogs/unreleased/zj-bump-linguist.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/zj-bump-linguist.yml b/changelogs/unreleased/zj-bump-linguist.yml new file mode 100644 index 000000000..c30138172 --- /dev/null +++ b/changelogs/unreleased/zj-bump-linguist.yml @@ -0,0 +1,5 @@ +--- +title: 'linguist: Bump version for better detection' +merge_request: 2591 +author: +type: changed diff --git a/ruby/Gemfile b/ruby/Gemfile index cdb388b5d..cddc975a1 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 7.9', require: 'linguist' +gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.1' gem 'rdoc', '~> 6.0' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 456f20130..87b1fc7f5 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -29,7 +29,7 @@ GEM ast (2.4.0) binding_ninja (0.2.3) builder (3.2.4) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) @@ -50,8 +50,8 @@ GEM ffi (1.13.1) gemojione (3.3.0) json - github-linguist (7.9.0) - charlock_holmes (~> 0.7.6) + github-linguist (7.11.0) + charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) rugged (>= 0.25.1) @@ -212,7 +212,7 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 1.0) - github-linguist (~> 7.9) + github-linguist (~> 7.11) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.12.0) |