diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 45a5e5aacce83..a3ed69be12c9d 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -272,7 +272,6 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-duo_api>=1.3<2:security/rubygem-duo_api \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 - BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index c97f50a4dba2b..34c54fa1a1167 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -155,6 +155,15 @@ gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -536,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi + # KAS GRPC protocol definitions + gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + +-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory + + gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory + @@ -557,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory