diff options
Diffstat (limited to 'devel/gitaly/files/patch-ruby_Gemfile')
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index 19fd7a0c66db..c45c9d730a3f 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,15 +1,17 @@ ---- ruby/Gemfile.orig 2022-04-20 09:55:22 UTC +--- ruby/Gemfile.orig 2022-05-20 13:52:23 UTC +++ ruby/Gemfile -@@ -2,7 +2,7 @@ source 'https://rubygems.org' +@@ -2,8 +2,8 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.1' +-gem 'activesupport', '~> 6.1.4.7' +gem 'gitlab-markup', '~> 1.8.0' - gem 'activesupport', '~> 6.1.4.7' ++gem 'activesupport', '~> 6.1.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false -@@ -13,29 +13,10 @@ gem 'faraday', '~> 1.0' + 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 @@ -32,11 +34,6 @@ - - gem 'grpc-tools', '~> 1.42.0' -end -- --# Gems required in omnibus-gitlab pipeline --group :development, :test, :omnibus do -- # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -- # resolved. For details, check discussion in -- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881 -- gem 'gitlab-license_finder', require: false --end + + # Gems required in omnibus-gitlab pipeline + group :development, :test, :omnibus do |