diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-05 18:13:48 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-05 18:13:48 +0300 |
| commit | 82e8a52af938eaa9af4a8fd3e424950ce7019090 (patch) | |
| tree | 9881013ae87865ffb3c2e69ade4a827710f58892 | |
| parent | 7f0047b8f9af148ca3b15a8c3e8cc44ae159991d (diff) | |
| parent | e0a31aaf6612d2bd944121031e8e878e28b071a9 (diff) | |
Merge branch 'bump_gh-linguist' into 'master'
Bump github-linguist to 7.5
See merge request gitlab-org/gitaly!1404
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index e2fa117b6..550bfae16 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', '~> 6.1', require: 'linguist' +gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.2.3' gem 'rdoc', '~> 4.2' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 063ed8eb6..0b4128444 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -49,10 +49,10 @@ GEM ffi (1.11.1) gemojione (3.3.0) json - github-linguist (6.4.1) + github-linguist (7.5.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) - mime-types (>= 1.19) + mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) gitlab-gollum-lib (4.2.7.7) @@ -108,6 +108,7 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.0) @@ -217,7 +218,7 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - github-linguist (~> 6.1) + github-linguist (~> 7.5) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.5.0) |