aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab/files')
-rw-r--r--www/gitlab/files/patch-Gemfile52
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example31
-rw-r--r--www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec9
3 files changed, 27 insertions, 65 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index fff952d72391..704da6697d22 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-05-14 17:45:50 UTC
+--- Gemfile.orig 2025-06-18 04:18:20 UTC
+++ Gemfile
-@@ -160,8 +160,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+@@ -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
# GraphQL API
@@ -11,7 +11,7 @@
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# Cells
-@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
+@@ -220,7 +220,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
@@ -20,7 +20,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
+@@ -231,7 +231,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
@@ -29,16 +29,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
- gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
-
- group :puma do
-- gem 'puma', '= 6.5.0', require: false, feature_category: :shared
-+ gem 'puma', '~> 6.5', require: false, feature_category: :shared
- gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
- end
-
-@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
@@ -47,7 +38,7 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -471,143 +471,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
@@ -84,7 +75,7 @@
-
-group :development, :test do
- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
-- gem 'bullet', '~> 7.2.0', feature_category: :shared
+- gem 'bullet', '~> 8.0.0', feature_category: :shared
- gem 'parser', '= 3.3.8.0', feature_category: :shared
- gem 'pry-byebug', feature_category: :shared
- gem 'pry-rails', '~> 0.3.9', feature_category: :shared
@@ -93,7 +84,7 @@
- gem 'awesome_print', require: false, feature_category: :shared
-
- gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
-- gem 'rspec-rails', '~> 7.0.0', feature_category: :shared
+- gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
- gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
@@ -113,7 +104,7 @@
- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
-
- gem 'knapsack', '~> 4.0.0', feature_category: :tooling
-- gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling
+- gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
- gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
-
- gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
@@ -191,27 +182,16 @@
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,16 +514,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
+@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+ 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', '~> 18.0', feature_category: :deployment_management
-
- # Lock the version before issues below are resolved:
- # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
- # Or we can upgrade to a more recent version as long as we can confirm
- # that it doesn't have the same issues.
--gem 'grpc', '= 1.63.0', feature_category: :shared
-+gem 'grpc', '~> 1.63', feature_category: :shared
++gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
- gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+ gem 'grpc', '~> 1.72.0', feature_category: :shared
-@@ -672,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
# Countries list
@@ -220,7 +200,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -753,10 +625,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -236,4 +216,4 @@
-gem "i18n_data", "~> 0.13.1", feature_category: :system_access
+gem "i18n_data", "~> 0.13", feature_category: :system_access
- gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.14", 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 3ace91d53c65..334de9d0c6fb 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-05-14 17:45:50 UTC
+--- config/gitlab.yml.example.orig 2025-06-18 04:18:20 UTC
+++ config/gitlab.yml.example
-@@ -489,7 +489,7 @@ production: &base
+@@ -493,7 +493,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,20 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -499,9 +499,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
-- artifacts_server: true # Set to false if you want to disable online view of HTML artifacts
-- # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
-- # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
-+ artifacts_server: false # Set to false if you want to disable online view of HTML artifacts
-+ external_http: ["127.0.0.1:8090"] # If defined, enables custom domain support in GitLab Pages
-+ # external_https: ["127.0.0.1:8090"] # If defined, enables custom domain and certificate support in GitLab Pages
-
- # 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).
-@@ -1233,13 +1233,13 @@ production: &base
+@@ -1238,13 +1238,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -38,7 +25,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
-@@ -1274,12 +1274,12 @@ production: &base
+@@ -1279,12 +1279,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +41,7 @@
# Git over HTTP
upload_pack: true
-@@ -1294,7 +1294,7 @@ production: &base
+@@ -1299,7 +1299,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).
@@ -63,7 +50,7 @@
cell:
# enabled: false
-@@ -1312,7 +1312,7 @@ production: &base
+@@ -1317,7 +1317,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 +59,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1339,13 +1339,13 @@ production: &base
+@@ -1344,13 +1344,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -88,7 +75,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1366,18 +1366,18 @@ production: &base
+@@ -1371,18 +1371,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -114,7 +101,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1604,13 +1604,13 @@ test:
+@@ -1609,13 +1609,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
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 9844d39df8d4..cf08a9593f99 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-05-14 17:45:50 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "activerecord", ">= 7"
@@ -9,12 +9,7 @@
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
spec.add_dependency "mutex_m", "~> 0.3"
spec.add_dependency "pg", "~> 1.5.6"
-@@ -40,11 +40,11 @@ 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"
+@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "json", "~> 2.7"
spec.add_dependency "jwt", "~> 2.5"
spec.add_dependency "logger", "~> 1.5"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 16:27:13 +0000