diff options
Diffstat (limited to 'devel/gitaly/files/patch-ruby_Gemfile')
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 3a4b1615b6d8..be0367a4849e 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,6 +1,6 @@ ---- ruby/Gemfile.orig 2022-12-07 19:19:46 UTC +--- ruby/Gemfile.orig 2022-11-21 09:43:30 UTC +++ ruby/Gemfile -@@ -1,15 +1,15 @@ +@@ -1,9 +1,9 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' @@ -10,22 +10,12 @@ +gem 'github-linguist', '~> 7.23', require: 'linguist' +gem 'gitlab-markup', '~> 1.8.0' +gem 'activesupport', '~> 6.1.6' - 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 gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools gem 'sentry-raven', '~> 3.0', require: false --gem 'faraday', '~> 1.0' -+gem 'faraday', '~> 1.10.2' gem 'rbtrace', require: false - - # The Gitaly Gem contains the Protobuf and gRPC definitions required by the -@@ -28,21 +28,12 @@ gem 'google-protobuf', '~> 3.21.7' - # Rails is currently blocked on the upgrade to the new major version for Redis, - # so we don't upgrade either until the issue is resolved. This is an indirect +@@ -26,19 +26,10 @@ gem 'google-protobuf', '~> 3.21.9' # dependency and can thus be removed when the version constraint is gone. --gem 'redis', '~> 4.7.1' -+gem 'redis', '~> 4.7' + gem 'redis', '~> 4.8.0' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false |