diff options
Diffstat (limited to 'www/gitlab/files')
5 files changed, 43 insertions, 47 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 3c6fe6426d7a..9e1f07d87311 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-01-22 04:13:11 UTC +--- Gemfile.orig 2025-02-19 06:08:46 UTC +++ Gemfile -@@ -164,7 +164,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api +@@ -165,7 +165,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api # GraphQL API gem 'graphql', '~> 2.4.1', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ +@@ -217,7 +217,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ 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 @@ -18,7 +18,7 @@ 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 -@@ -227,7 +227,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe +@@ -228,7 +228,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared @@ -27,7 +27,7 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -283,7 +283,7 @@ group :puma do +@@ -284,7 +284,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do @@ -36,7 +36,7 @@ gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end -@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature +@@ -292,7 +292,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs @@ -51,13 +51,14 @@ # Metrics -gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared +gem 'webrick', '~> 1.8', require: false, feature_category: :shared - gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client', feature_category: :shared + gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -474,140 +474,21 @@ group :development do +@@ -473,138 +473,15 @@ gem 'warning', '~> 1.3.0', feature_category: :shared + gem 'warning', '~> 1.3.0', feature_category: :shared - group :development do +-group :development do - gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared @@ -72,7 +73,7 @@ - - gem 'listen', '~> 3.7', feature_category: :shared - -- gem 'ruby-lsp', "~> 0.22.0", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - @@ -80,16 +81,16 @@ - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - gem 'git', '~> 1.8', feature_category: :shared - end - +- # Used by +- # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` +- # * `lib/tasks/gitlab/db/migration_squash.rake` +- gem 'git', '~> 1.8', feature_category: :shared +-end +- -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared -- gem 'bullet', '~> 7.1.2', feature_category: :shared -- gem 'parser', '= 3.3.6.0', feature_category: :shared +- gem 'bullet', '~> 7.2.0', feature_category: :shared +- gem 'parser', '= 3.3.7.1', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared @@ -106,13 +107,11 @@ - gem 'spring', '~> 4.1.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - -- gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling +- gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling - -- gem 'bundler-audit', '~> 0.9.1', require: false, feature_category: :shared -- - # Benchmarking & profiling -- gem 'benchmark-ips', '~> 2.11.0', require: false, feature_category: :shared +- gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - # Profiling data from CI/CD pipelines @@ -163,7 +162,6 @@ -end - -group :test do -- gem 'fuubar', '~> 2.2.0', feature_category: :tooling - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling @@ -177,8 +175,8 @@ - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared -- gem 'email_spec', '~> 2.2.0', feature_category: :shared -- gem 'webmock', '~> 3.24.0', 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 - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling @@ -195,12 +193,12 @@ 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 -@@ -645,13 +526,13 @@ gem 'gitaly', '~> 17.7.0', feature_category: :gitaly - gem 'gitaly', '~> 17.7.0', feature_category: :gitaly +@@ -642,13 +519,13 @@ gem 'gitaly', '~> 17.8.0', feature_category: :gitaly + gem 'gitaly', '~> 17.8.0', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.8.0', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 17.9.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -211,8 +209,8 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -672,7 +553,7 @@ gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :s - gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :shared +@@ -669,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : + gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared @@ -220,7 +218,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -752,12 +633,17 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -750,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -231,11 +229,9 @@ + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation - gem 'openbao_client', path: 'gems/openbao_client', feature_category: :artifact_security - gem 'paper_trail', '~> 15.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 0.2.5", require: 'cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 08982f34de3d..bdfc3d16cb92 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2025-01-15 09:55:34 UTC +--- config/gitlab.yml.example.orig 2025-02-19 06:08:46 UTC +++ config/gitlab.yml.example @@ -473,7 +473,7 @@ production: &base ## GitLab Pages @@ -61,9 +61,9 @@ - # 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: - # enabled: false -@@ -1295,7 +1295,7 @@ production: &base +@@ -1304,7 +1304,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 -@@ -1319,13 +1319,13 @@ production: &base +@@ -1331,13 +1331,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 -@@ -1346,18 +1346,18 @@ production: &base +@@ -1358,18 +1358,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: -@@ -1584,13 +1584,13 @@ test: +@@ -1596,13 +1596,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 c35affe6219a..4792c05020d4 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 2024-11-20 11:30:30 UTC +--- config/initializers/1_settings.rb.orig 2025-02-19 06:08:46 UTC +++ config/initializers/1_settings.rb -@@ -211,11 +211,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user +@@ -214,11 +214,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 f0aecede0f2a..3229305272cb 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-01-15 09:55:34 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-02-19 06:08:46 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| @@ -22,4 +22,4 @@ + spec.add_dependency "minitest", "~> 5.11" spec.add_dependency "parallel", "~> 1.19" spec.add_dependency "rack", "~> 2.2.9" - spec.add_dependency "rexml", "~> 3.3.2" + spec.add_dependency "rexml", "~> 3.4.0" 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 index 792a7e1bd16e..9d861e5e52b9 100644 --- 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 @@ -1,4 +1,4 @@ ---- gems/gitlab-secret_detection/gitlab-secret_detection.gemspec.orig 2024-12-18 07:22:32 UTC +--- 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'] @@ -8,4 +8,4 @@ + 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.4" + spec.add_runtime_dependency "re2", "~> 2.7" |