ON is upgrad GITLAB_GIT_VERSION= 2.50.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} -GITLAB_GIT_MASTER_VERSION= e417bf2996fbd77acabbf354ed9b5adedacf91c9 -GITLAB_GIT_PREV_VERSION= c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd +GITLAB_GIT_MASTER_VERSION= b15384c06f77bc2d34d0d3623a8a58218313a561 +GITLAB_GIT_PREV_VERSION= e417bf2996fbd77acabbf354ed9b5adedacf91c9 # Overwrite version for gitlab-kas-grpc #GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index a504fac58d1e..f84e1dd2dff2 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1775709606 -SHA256 (gitlab-foss-v18.10.3.tar.bz2) = 2369e129d2ecf32777bcecd45c19007e784029c649bbe327b4096a37beaace30 -SIZE (gitlab-foss-v18.10.3.tar.bz2) = 134856554 -TIMESTAMP = 1775709654 -SHA256 (gitlab-v18.10.3-ee.tar.bz2) = 91737b716ec4d8f491fb1ff18159694420b735fff4227e132bd5b09fef619e30 -SIZE (gitlab-v18.10.3-ee.tar.bz2) = 153287465 +TIMESTAMP = 1776342388 +SHA256 (gitlab-foss-v18.11.0.tar.bz2) = e8f3f9d8885634f682524dd50e2aec871cd36761ee6a7cd06fe2d07fd36f19e0 +SIZE (gitlab-foss-v18.11.0.tar.bz2) = 134339095 +TIMESTAMP = 1776342389 +SHA256 (gitlab-v18.11.0-ee.tar.bz2) = d80215d720dcb4e0d7c923eddab5e04a013546017a9e1d6431e48f78e8e4517e +SIZE (gitlab-v18.11.0-ee.tar.bz2) = 153144216 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 07addd8dc048..26fd1e56cd41 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2026-03-18 13:38:20 UTC +--- Gemfile.orig 2026-04-15 21:42:44 UTC +++ Gemfile -@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -167,7 +167,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -298,7 +298,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu +@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Background jobs @@ -18,7 +18,7 @@ gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -475,137 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # +@@ -476,136 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -52,9 +52,8 @@ -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +- gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -141,7 +140,7 @@ - gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'test-prof', '~> 1.5.0', feature_category: :tooling +- gem 'test-prof', '~> 1.6.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling @@ -150,14 +149,14 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - -- gem 'gitlab_quality-test_tooling', '~> 3.9.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.10.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,7 +520,7 @@ gem 'gitaly', '~> 18.8.0', feature_category: :gitaly - gem 'gitaly', '~> 18.8.0', feature_category: :gitaly +@@ -642,7 +521,7 @@ gem 'gitaly', '~> 18.10.0', feature_category: :gitaly + gem 'gitaly', '~> 18.10.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management @@ -165,7 +164,7 @@ # Knowledge Graph GRPC protocol definitions gem 'gitlab-gkg-proto', '~> 0.7.0', feature_category: :knowledge_graph -@@ -668,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -668,7 +547,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Countries list @@ -174,7 +173,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -@@ -749,11 +627,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -749,11 +628,16 @@ 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 0a64246613f1..c16c208783c7 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 2026-03-18 13:38:20 UTC +--- config/gitlab.yml.example.orig 2026-04-15 21:42:44 UTC +++ config/gitlab.yml.example -@@ -551,7 +551,7 @@ production: &base +@@ -567,7 +567,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1326,7 +1326,7 @@ production: &base +@@ -1342,7 +1342,7 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port] # The host:port portion will be used as the TLS server name for SNI. # Example: dns+tls://1.1.1.1/gitaly.example.com:8075 -@@ -1335,7 +1335,7 @@ production: &base +@@ -1351,7 +1351,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) @@ -27,7 +27,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 -@@ -1370,12 +1370,12 @@ production: &base +@@ -1386,12 +1386,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -43,7 +43,7 @@ # Git over HTTP upload_pack: true -@@ -1390,7 +1390,7 @@ production: &base +@@ -1406,7 +1406,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). @@ -52,7 +52,7 @@ database_traffic_capture: config: -@@ -1416,7 +1416,7 @@ production: &base +@@ -1432,7 +1432,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). @@ -61,7 +61,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1437,13 +1437,13 @@ production: &base +@@ -1453,13 +1453,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -77,7 +77,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1464,18 +1464,18 @@ production: &base +@@ -1480,18 +1480,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -103,7 +103,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1702,13 +1702,13 @@ test: +@@ -1729,13 +1729,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-package.json b/www/gitlab/files/patch-package.json deleted file mode 100644 index a3e1b75ba6a0..000000000000 --- a/www/gitlab/files/patch-package.json +++ /dev/null @@ -1,12 +0,0 @@ ---- package.json.orig 2026-02-18 17:09:38 UTC -+++ package.json -@@ -320,7 +320,8 @@ - "@types/node": "14.17.5", - "chokidar": "^3.5.3", - "nwsapi": "2.2.2", -- "tough-cookie": "4.1.3" -+ "tough-cookie": "4.1.3", -+ "tree-sitter": "0.22.4" - }, - "engines": { - "node": ">=12.22.1", diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index c9c05322d26a..642c499194ba 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.10-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.11-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 18.6.x to 18.7.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.9-18.10-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.10-18.11-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: