diff options
Diffstat (limited to 'www/gitlab/files')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 36 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 20 |
2 files changed, 29 insertions, 27 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index e4317e6fb580..66fa089743a5 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-03-19 10:41:02 UTC +--- Gemfile.orig 2025-04-16 04:05:48 UTC +++ Gemfile -@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea +@@ -168,8 +168,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 @@ -9,9 +9,9 @@ +gem 'graphql', '~> 2.4.11', path: 'vendor/gems/graphql', feature_category: :api +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api - gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -217,7 +217,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ + # Cells +@@ -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 -@@ -228,7 +228,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,7 +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 -@@ -284,7 +284,7 @@ group :puma do +@@ -287,7 +287,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do @@ -38,16 +38,16 @@ gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end -@@ -292,7 +292,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 --gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability -+gem 'sidekiq', '~> 7.2.4', require: 'sidekiq', feature_category: :scalability +-gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability ++gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -430,7 +430,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: +@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics @@ -56,7 +56,7 @@ gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -472,138 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared @@ -106,11 +106,11 @@ - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - -- gem 'spring', '~> 4.1.0', feature_category: :shared +- gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false -- gem 'haml_lint', '~> 0.58', feature_category: :tooling +- gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared @@ -139,6 +139,8 @@ - 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 -end - group :development, :test, :danger do @@ -195,7 +197,7 @@ 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 -@@ -638,16 +515,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -643,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions @@ -215,7 +217,7 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -668,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : +@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared # Countries list @@ -224,7 +226,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -749,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -240,4 +242,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.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.5", 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 a78db5ae4e8c..09cb658db5d2 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-03-19 10:41:02 UTC +--- config/gitlab.yml.example.orig 2025-04-16 04:05:48 UTC +++ config/gitlab.yml.example -@@ -478,7 +478,7 @@ production: &base +@@ -484,7 +484,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -488,9 +488,9 @@ production: &base +@@ -494,9 +494,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). -@@ -1221,13 +1221,13 @@ production: &base +@@ -1227,13 +1227,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 -@@ -1262,12 +1262,12 @@ production: &base +@@ -1268,12 +1268,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +54,7 @@ # Git over HTTP upload_pack: true -@@ -1282,7 +1282,7 @@ production: &base +@@ -1288,7 +1288,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 +63,7 @@ cell: # enabled: false -@@ -1300,7 +1300,7 @@ production: &base +@@ -1306,7 +1306,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 -@@ -1327,13 +1327,13 @@ production: &base +@@ -1333,13 +1333,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 -@@ -1354,18 +1354,18 @@ production: &base +@@ -1360,18 +1360,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: -@@ -1592,13 +1592,13 @@ test: +@@ -1598,13 +1598,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: |