diff options
Diffstat (limited to 'devel/gitaly/files/patch-ruby_Gemfile')
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index e70d313bfb2a..189679801611 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,11 +1,6 @@ ---- ruby/Gemfile.orig 2021-06-21 15:49:22 UTC +--- ruby/Gemfile.orig 2021-07-21 11:54:58 UTC +++ ruby/Gemfile -@@ -3,31 +3,21 @@ source 'https://rubygems.org' - gem 'rugged', '~> 1.1' - gem 'github-linguist', '~> 7.12', require: 'linguist' - gem 'gitlab-markup', '~> 1.7.1' --gem 'activesupport', '~> 6.0.3.6' -+gem 'activesupport', '~> 6.1.3.2' +@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false @@ -14,18 +9,12 @@ gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false - - # Labkit provides observability functionality --gem 'gitlab-labkit', '~> 0.17.1' -+gem 'gitlab-labkit', '~> 0.18.0' - - # Detects the open source license the repository includes +@@ -19,15 +19,4 @@ gem 'gitlab-labkit', '~> 0.20.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.14.1' --gem 'google-protobuf', '~> 3.14.0' -+gem 'google-protobuf', '~> 3.17.1' - +-gem 'google-protobuf', '~> 3.17.0' +- -group :development, :test do - gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false @@ -36,3 +25,4 @@ - - gem 'grpc-tools', '= 1.30.2' -end ++gem 'google-protobuf', '~> 3.17.3' |