File gitlab-ce.less_strict.patch of Package gitlab-ce
Index: gitlab-ce/Gemfile
===================================================================
--- gitlab-ce.orig/Gemfile
+++ gitlab-ce/Gemfile
@@ -28,7 +28,7 @@ gem 'bundler-checksum', '~> 0.1.0', path
if next?
gem 'rails', '~> 7.2.2.1', feature_category: :shared
else
- gem 'rails', '~> 7.1.5.1', feature_category: :shared
+ gem 'rails', '~> 7.1.6', feature_category: :shared
end
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared
@@ -69,14 +69,14 @@ gem 'sprockets-rails', '~> 3.5.1', feat
gem 'view_component', '~> 3.23.2', feature_category: :shared
# Supported DBs
-gem 'pg', '~> 1.5.6', feature_category: :database
+gem 'pg', '~> 1.6.1', feature_category: :database
gem 'rugged', '~> 1.6', feature_category: :gitaly
gem 'faraday', '~> 2', feature_category: :shared
gem 'faraday-retry', '~> 2', feature_category: :shared
# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
-gem 'logger', '~> 1.7.0', feature_category: :shared
+gem 'logger', '>= 1.7.0', feature_category: :shared
gem 'marginalia', '~> 1.11.1', feature_category: :database
@@ -224,7 +224,7 @@ gem 'gitlab-fog-azure-rm', '~> 2.2.0', r
gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
# We need >= 0.11.1 because that's when match_glob support is added to list_objects
-gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared
+gem 'google-apis-core', '~> 0.11.2', '>= 0.11.1', feature_category: :shared
gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
@@ -235,7 +235,7 @@ gem 'google-apis-serviceusage_v1', '~> 0
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
-gem 'googleauth', '~> 1.8.1', feature_category: :shared
+gem 'googleauth', '>= 1.8.1', feature_category: :shared
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
@@ -246,9 +246,9 @@ gem 'seed-fu', '~> 2.3.7', feature_categ
gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
-gem 'aws-sdk-core', '~> 3.225.0', feature_category: :global_search
+gem 'aws-sdk-core', '>= 3.225.0', feature_category: :global_search
gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search
-gem 'aws-sdk-s3', '~> 1.189.0', feature_category: :global_search
+gem 'aws-sdk-s3', '>= 1.189.0', feature_category: :global_search
gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
# Used with Elasticsearch to support http keep-alive connections
@@ -291,7 +291,7 @@ gem 'rack', '~> 2.2.9', feature_category
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
group :puma do
- gem 'puma', '= 6.6.0', require: false, feature_category: :shared
+ gem 'puma', '~> 6.6.1', require: false, feature_category: :shared
gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
end
@@ -362,7 +362,7 @@ gem 'sanitize', '~> 6.0.2', feature_cate
gem 'babosa', '~> 2.0', feature_category: :shared
# Sanitizes SVG input
-gem 'loofah', '~> 2.24.0', feature_category: :shared
+gem 'loofah', '>= 2.24.0', feature_category: :shared
# Used to provide license templates
gem 'licensee', '~> 9.16', feature_category: :shared
@@ -441,10 +441,11 @@ gem 'prometheus-client-mmap', '~> 1.2.8'
# Event-driven reactor for Ruby
# Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.24.0', require: false, feature_category: :shared
+gem 'async', '>= 2.24.0', require: false, feature_category: :shared
# Security report schemas used to validate CI job artifacts of security jobs
gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
+gem 'git' # workaround for missing require in the gemspec for gitlab-security_report_schemas
# OpenTelemetry
group :opentelemetry do
@@ -654,11 +655,12 @@ gem 'spamcheck', '~> 1.3.0', feature_cat
gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '>= 17.11.0', feature_category: :deployment_management
# Lock until 1.74.0 is available
# https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
-gem 'grpc', '= 1.63.0', feature_category: :shared
+# gem 'grpc', '= 1.63.0', feature_category: :shared
+gem 'grpc', '~> 1.72.0', feature_category: :shared
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
@@ -672,7 +674,7 @@ gem 'unleash', '~> 3.2.2', feature_categ
gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
# Structured logging
-gem 'lograge', '~> 0.5', feature_category: :shared
+gem 'lograge', '>= 0.14.0', feature_category: :shared
gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
# DNS Lookup
@@ -706,11 +708,11 @@ gem 'valid_email', '~> 0.1', feature_cat
# JSON
gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
-gem 'json', '~> 2.11.0', feature_category: :shared
+gem 'json', '>= 2.11.0', feature_category: :shared
gem 'json_schemer', '~> 2.3.0', feature_category: :shared
-gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared
+gem 'oj', '>= 3.16.0', '>=3.16.10', feature_category: :shared
gem 'oj-introspect', '~> 0.8', feature_category: :shared
-gem 'multi_json', '~> 1.14.1', feature_category: :shared
+gem 'multi_json', '>= 1.14.1', feature_category: :shared
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared
gem 'webauthn', '~> 3.0', feature_category: :shared
@@ -718,7 +720,7 @@ gem 'webauthn', '~> 3.0', feature_catego
# IPAddress utilities
gem 'ipaddress', '~> 0.8.3', feature_category: :shared
-gem 'parslet', '~> 1.8', feature_category: :shared
+gem 'parslet', '~> 2.0', feature_category: :shared
gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared
@@ -756,7 +758,7 @@ gem 'net-http', '= 0.6.0', feature_categ
# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986,
# which can be removed after Rails 7.2 upgrade
# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450
-gem 'uri', '= 0.13.2', feature_category: :shared
+gem 'uri', '= 0.13.3', feature_category: :shared
gem 'duo_api', '~> 1.3', feature_category: :system_access
Index: gitlab-ce/lib/tasks/yarn.rake
===================================================================
--- gitlab-ce.orig/lib/tasks/yarn.rake
+++ gitlab-ce/lib/tasks/yarn.rake
@@ -3,6 +3,7 @@
namespace :yarn do
desc 'Ensure Yarn is installed'
task :available do
+=begin
unless system('yarn --version', out: File::NULL)
warn(
Rainbow('Error: Yarn executable was not detected in the system.').red,
@@ -10,6 +11,8 @@ namespace :yarn do
)
abort
end
+=end
+ warn "yarn:check disabled"
end
desc 'Ensure Node dependencies are installed'
@@ -25,9 +28,12 @@ namespace :yarn do
desc 'Install Node dependencies with Yarn'
task install: ['yarn:available'] do
+=begin
unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline')
abort Rainbow('Error: Unable to install node modules.').red
end
+=end
+ warn "yarn:install disabled"
end
desc 'Remove Node dependencies'
Index: gitlab-ce/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
===================================================================
--- gitlab-ce.orig/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
+++ gitlab-ce/gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
spec.add_dependency "mutex_m", "~> 0.3"
- spec.add_dependency "pg", "~> 1.5.6"
+ spec.add_dependency "pg", "~> 1.6.1"
spec.add_dependency "rainbow", "~> 3.0"
spec.add_dependency "thor", "~> 1.3"
@@ -40,11 +40,12 @@ Gem::Specification.new do |spec|
spec.add_dependency "concurrent-ruby", "~> 1.1"
spec.add_dependency "faraday", "~> 2"
spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
- spec.add_dependency "grpc", "= 1.63.0"
+ # spec.add_dependency "grpc", "= 1.63.0"
+ spec.add_dependency "grpc", "~> 1.72.0"
spec.add_dependency "json", "~> 2.7"
spec.add_dependency "jwt", "~> 2.5"
spec.add_dependency "logger", "~> 1.5"
- spec.add_dependency "minitest", "~> 5.11.0"
+# spec.add_dependency "minitest", "~> 5.11.0"
spec.add_dependency "parallel", "~> 1.19"
spec.add_dependency "rack", "~> 2.2.9"
spec.add_dependency "rexml", "~> 3.4.0"
Index: gitlab-ce/config/initializers/sprockets_patch.rb
===================================================================
--- gitlab-ce.orig/config/initializers/sprockets_patch.rb
+++ gitlab-ce/config/initializers/sprockets_patch.rb
@@ -8,7 +8,7 @@
require 'sprockets/utils'
-unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.5')
raise 'New version of Sprockets detected. This patch can likely be removed.'
end
