diff options
Diffstat (limited to 'www/gitlab/files')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 31 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 14 |
2 files changed, 19 insertions, 26 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 7943be7c3489..c5e64b759360 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-08-20 06:43:08 UTC +--- Gemfile.orig 2025-10-21 19:24:47 UTC +++ Gemfile @@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api @@ -18,13 +18,14 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -468,148 +468,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling -- gem 'rubocop', feature_category: :tooling +- gem 'rubocop', feature_category: :tooling, require: false +- gem 'debug', '~> 1.11.0', feature_category: :shared - - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared @@ -80,9 +81,6 @@ - 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 -- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling -- - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling @@ -97,11 +95,6 @@ - - gem 'pact', '~> 1.64', feature_category: :shared - -- # 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.9.0', feature_category: :shared -- - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling @@ -161,26 +154,26 @@ - # 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.18.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.20.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 -@@ -643,10 +510,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 18.2.0', feature_category: :gitaly -+gem 'gitaly', '~> 18.2', feature_category: :gitaly +-gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 18.4', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management gem 'grpc', '~> 1.74.0', feature_category: :shared -@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list @@ -189,7 +182,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -752,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 5c05397684c9..d4e98d985eb3 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-08-20 06:43:08 UTC +--- config/gitlab.yml.example.orig 2025-10-21 19:24:47 UTC +++ config/gitlab.yml.example -@@ -511,7 +511,7 @@ production: &base +@@ -507,7 +507,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1261,13 +1261,13 @@ production: &base +@@ -1252,13 +1252,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -25,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 -@@ -1302,12 +1302,12 @@ production: &base +@@ -1293,12 +1293,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,15 +41,15 @@ # Git over HTTP upload_pack: true -@@ -1322,7 +1322,7 @@ production: &base +@@ -1313,7 +1313,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 - cell: - # enabled: false + database_traffic_capture: + config: @@ -1340,7 +1340,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. |