diff options
Diffstat (limited to 'devel/gitaly/files/patch-ruby_Gemfile')
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index a4f633b918c9..cacfa5d52e14 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,25 +1,19 @@ ---- ruby/Gemfile.orig 2022-06-21 10:12:22 UTC +--- ruby/Gemfile.orig 2022-07-21 13:59:14 UTC +++ ruby/Gemfile -@@ -2,8 +2,8 @@ source 'https://rubygems.org' +@@ -1,9 +1,9 @@ + 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 'github-linguist', '~> 7.20', require: 'linguist' +gem 'gitlab-markup', '~> 1.8.0' +gem 'activesupport', '~> 6.1.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false -@@ -13,24 +13,13 @@ gem 'faraday', '~> 1.0' - gem 'rbtrace', require: false - - # Labkit provides observability functionality --gem 'gitlab-labkit', '~> 0.21.1' -+gem 'gitlab-labkit', '~> 0.23.0' - - # Detects the open source license the repository includes - # This version needs to be in sync with GitLab CE/EE +@@ -20,17 +20,6 @@ gem 'gitlab-labkit', '~> 0.23' gem 'licensee', '~> 9.14.1' gem 'google-protobuf', '~> 3.19.0' |