ion: &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: