diff options
Diffstat (limited to 'www/gitlab/files')
5 files changed, 36 insertions, 54 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index b7fc39e4f8be..e4317e6fb580 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-03-11 19:30:16 UTC +--- Gemfile.orig 2025-03-19 10:41:02 UTC +++ Gemfile @@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared @@ -47,18 +47,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -327,8 +327,8 @@ gem 'device_detector', feature_category: :shared - gem 'device_detector', feature_category: :shared - - # Redis --gem 'redis', '~> 5.3.0', feature_category: :redis --gem 'redis-clustering', '~> 5.3.0', feature_category: :redis -+gem 'redis', '~> 5.3', feature_category: :redis -+gem 'redis-clustering', '~> 5.3', feature_category: :redis - gem 'connection_pool', '~> 2.4', feature_category: :shared - - # Redis session store -@@ -431,7 +431,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: +@@ -430,7 +430,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics @@ -67,12 +56,12 @@ gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -473,138 +473,15 @@ gem 'warning', '~> 1.3.0', feature_category: :shared +@@ -472,138 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared - gem 'warning', '~> 1.3.0', feature_category: :shared + gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do -- gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling +- gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - @@ -147,7 +136,7 @@ - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared -- gem 'vite_ruby', '~> 3.8.0', feature_category: :shared +- gem 'vite_ruby', '~> 3.9.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling -end @@ -160,7 +149,7 @@ - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling -- gem 'undercover', '~> 0.5.0', require: false, feature_category: :tooling +- gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline @@ -187,7 +176,7 @@ - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - -- gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared +- gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared @@ -195,23 +184,27 @@ - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared -- gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling +- gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - -- gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -642,13 +519,13 @@ gem 'gitaly', '~> 17.8.0', feature_category: :gitaly - gem 'gitaly', '~> 17.8.0', feature_category: :gitaly +@@ -638,16 +515,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside + gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat + + # Gitaly GRPC protocol definitions +-gem 'gitaly', '~> 17.8.0', feature_category: :gitaly ++gem 'gitaly', '~> 17.8', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.9.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 17.9', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -222,7 +215,7 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -669,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : +@@ -668,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared # Countries list @@ -231,7 +224,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -749,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index bdfc3d16cb92..a78db5ae4e8c 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2025-02-19 06:08:46 UTC +--- config/gitlab.yml.example.orig 2025-03-19 10:41:02 UTC +++ config/gitlab.yml.example -@@ -473,7 +473,7 @@ production: &base +@@ -478,7 +478,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -483,9 +483,9 @@ production: &base +@@ -488,9 +488,9 @@ production: &base host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS @@ -22,7 +22,7 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1216,13 +1216,13 @@ production: &base +@@ -1221,13 +1221,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +38,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1257,12 +1257,12 @@ production: &base +@@ -1262,12 +1262,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,16 +54,16 @@ # Git over HTTP upload_pack: true -@@ -1277,7 +1277,7 @@ production: &base +@@ -1282,7 +1282,7 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret - # This section to be removed when we merge https://gitlab.com/gitlab-org/gitlab-development-kit/-/merge_requests/4382 - topology_service: -@@ -1304,7 +1304,7 @@ production: &base + cell: + # enabled: false +@@ -1300,7 +1300,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -72,7 +72,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1331,13 +1331,13 @@ production: &base +@@ -1327,13 +1327,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +88,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1358,18 +1358,18 @@ production: &base +@@ -1354,18 +1354,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +114,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1596,13 +1596,13 @@ test: +@@ -1592,13 +1592,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index 4792c05020d4..2c8adc9a51e9 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2025-02-19 06:08:46 UTC +--- config/initializers/1_settings.rb.orig 2025-03-19 10:41:02 UTC +++ config/initializers/1_settings.rb -@@ -214,11 +214,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user +@@ -215,11 +215,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user Settings.gitlab['user'] ||= 'git' # External configuration may cause the ssh user to differ from the GitLab user Settings.gitlab['ssh_user'] ||= Settings.gitlab.user diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec index 3229305272cb..7346dbb850eb 100644 --- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec +++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec @@ -1,4 +1,4 @@ ---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-02-19 06:08:46 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-03-19 10:41:02 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| @@ -15,9 +15,9 @@ spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3" - spec.add_dependency "grpc", "= 1.63.0" + spec.add_dependency "grpc", "~> 1.63" - spec.add_dependency "json", "~> 2.7.2" + spec.add_dependency "json", "~> 2.7" spec.add_dependency "jwt", "~> 2.5" - spec.add_dependency "logger", "~> 1.5.3" + spec.add_dependency "logger", "~> 1.5" - spec.add_dependency "minitest", "~> 5.11.0" + spec.add_dependency "minitest", "~> 5.11" spec.add_dependency "parallel", "~> 1.19" diff --git a/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec b/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec deleted file mode 100644 index 9d861e5e52b9..000000000000 --- a/www/gitlab/files/patch-gems_gitlab-secret__detection_gitlab-secret__detection.gemspec +++ /dev/null @@ -1,11 +0,0 @@ ---- gems/gitlab-secret_detection/gitlab-secret_detection.gemspec.orig 2025-02-19 06:08:46 UTC -+++ gems/gitlab-secret_detection/gitlab-secret_detection.gemspec -@@ -24,7 +24,7 @@ Gem::Specification.new do |spec| - spec.files = Dir['lib/**/*.rb'] - spec.require_paths = ["lib"] - -- spec.add_runtime_dependency "grpc", "= 1.63.0" -+ spec.add_runtime_dependency "grpc", "~> 1.63" - spec.add_runtime_dependency "grpc-tools", "= 1.63.0" - spec.add_runtime_dependency "parallel", "~> 1.22" - spec.add_runtime_dependency "re2", "~> 2.7" |