git: 7f5c1fd58ab5 - main - www/gitlab-ce: major update to 14.7.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Wed, 26 Jan 2022 10:43:34 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7f5c1fd58ab53af05129c4dbeb96a6a6e6fffe38

commit 7f5c1fd58ab53af05129c4dbeb96a6a6e6fffe38
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-01-26 07:16:17 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-01-26 10:43:01 +0000

    www/gitlab-ce: major update to 14.7.0
    
    Changelog:
    https://about.gitlab.com/releases/2022/01/22/gitlab-14-7-released/
---
 www/gitlab-ce/Makefile                             | 43 ++++++++++++----------
 www/gitlab-ce/distinfo                             |  6 +--
 www/gitlab-ce/files/patch-Gemfile                  | 38 ++++++++-----------
 .../files/patch-config_gitlab.yml.example          | 14 +++----
 ...-lib_gitlab_sidekiq__logging_json__formatter.rb | 10 -----
 ...b_gitlab_sidekiq__logging_structured__logger.rb | 11 ------
 ...patch-lib_gitlab_sidekiq__middleware_monitor.rb | 10 -----
 www/gitlab-ce/pkg-message                          |  4 +-
 8 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index aadd8c479dc7..d4bb50cacec7 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,8 +1,8 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	14.6.3
-PORTREVISION=	2
+PORTVERSION=	14.7.0
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -17,15 +17,15 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=2.17.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=14.4.0:net/gitlab-agent \
-	gitlab-pages>=1.49.0:www/gitlab-pages \
-	gitlab-shell>=13.22.0:devel/gitlab-shell \
+	gitlab-pages>=1.51.0:www/gitlab-pages \
+	gitlab-shell>=13.22.2:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.14:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
-	rubygem-rails61>=6.1.4.1<6.1.5:www/rubygem-rails61 \
-	rubygem-bootsnap19>=1.9.1<1.10:devel/rubygem-bootsnap19 \
+	rubygem-rails61>=6.1.4.4<6.1.5:www/rubygem-rails61 \
+	rubygem-bootsnap>=1.9.1<1.11:devel/rubygem-bootsnap \
 	rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
 	rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \
@@ -58,7 +58,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.4.0<2.5:devel/rubygem-omniauth_crowd \
 	rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
-	rubygem-gitlab-omniauth-openid-connect>=0.8.0<0.9.0:net/rubygem-gitlab-omniauth-openid-connect \
+	rubygem-gitlab-omniauth-openid-connect>=0.9.1<0.10.0:net/rubygem-gitlab-omniauth-openid-connect \
 	rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
 	rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
 	rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
@@ -74,7 +74,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
 	rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \
-	rubygem-acme-client>=2.0.6<3:security/rubygem-acme-client \
+	rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \
 	rubygem-browser>=4.2<5.0:www/rubygem-browser \
 	rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \
 	rubygem-gpgme>=2.0.20<2.1.0:security/rubygem-gpgme \
@@ -84,7 +84,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \
 	rubygem-graphql>=1.11.10<1.12:devel/rubygem-graphql \
-	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
+	rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \
 	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.4.0<0.5:devel/rubygem-graphlient \
@@ -112,6 +112,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
 	rubygem-aws-sdk-s3>=1<2:devel/rubygem-aws-sdk-s3 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
+	rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
 	rubygem-html-pipeline>=2.13.2<2.14:textproc/rubygem-html-pipeline \
 	rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
@@ -127,10 +128,10 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \
 	rubygem-asciidoctor-plantuml>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml \
 	rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \
-	rubygem-rouge326>=3.26.1<3.27:textproc/rubygem-rouge326 \
+	rubygem-rouge>=3.27.0<3.28:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
 	rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
-	rubygem-nokogiri>=1.11.5<1.12:textproc/rubygem-nokogiri \
+	rubygem-nokogiri>=1.12<2:textproc/rubygem-nokogiri \
 	rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.3<4:textproc/rubygem-diffy \
@@ -141,9 +142,9 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \
 	rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \
 	rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \
-	rubygem-acts-as-taggable-on>=8.1<8.2:www/rubygem-acts-as-taggable-on \
+	rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq>=6.3<6.4:devel/rubygem-sidekiq \
-	rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
+	rubygem-sidekiq-cron>=1.2<2.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=1.8.1<1.9.0:databases/rubygem-redis-namespace \
 	rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
@@ -167,12 +168,12 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-asana>=0.10.3<0.11:www/rubygem-asana \
 	rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
 	rubygem-kubeclient>=4.9.2<4.10.0:www/rubygem-kubeclient \
-	rubygem-sanitize>=5.2.1<6:textproc/rubygem-sanitize \
+	rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \
 	rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
-	rubygem-ruby-magic>=0.4<1:devel/rubygem-ruby-magic \
+	rubygem-ruby-magic>=0.5.3<1:devel/rubygem-ruby-magic \
 	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
 	rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
@@ -190,7 +191,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
 	rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \
 	rubygem-premailer-rails-rails61>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails61 \
-	rubygem-gitlab-labkit>=0.21.1<0.22:devel/rubygem-gitlab-labkit \
+	rubygem-gitlab-labkit>=0.21.3<0.22:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.14.0:devel/rubygem-thrift \
 	rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails61>=6.0<7.0:devel/rubygem-rails-i18n-rails61 \
@@ -225,9 +226,9 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.1<2.0:security/rubygem-bcrypt_pbkdf \
 	rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \
-	rubygem-gitaly>=14.4.0.pre.rc43<14.5.0:net/rubygem-gitaly \
+	rubygem-gitaly>=14.6.0.pre.rc1<14.7.0:net/rubygem-gitaly \
 	rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \
-	rubygem-grpc142>=1.30.2<2:net/rubygem-grpc142 \
+	rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \
 	rubygem-google-protobuf>=3.19.0<3.20:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=2.0.1<3:www/rubygem-toml-rb \
 	rubygem-flipper021>=0.21.0<0.22:devel/rubygem-flipper021 \
@@ -274,7 +275,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	e085746f07774a1050d9fceffa7e17b262f3132d
+GL_COMMIT=	abbf44bd6cfb29413b3cf5768b691e5b222b89ea
 
 USERS=	git
 GROUPS=	git
@@ -364,7 +365,6 @@ post-install:
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/knapsack/gcs" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST}
@@ -372,6 +372,7 @@ post-install:
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared" >> ${TMPPLIST}
@@ -380,7 +381,9 @@ post-install:
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST}
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 0b402a8340f5..c7d96ac0b340 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642666034
-SHA256 (gitlab-org-gitlab-foss-e085746f07774a1050d9fceffa7e17b262f3132d_GL0.tar.gz) = ce834f94c3b5f54e2289f7499126ca3a418932fede39d944d0f0e332d25f897a
-SIZE (gitlab-org-gitlab-foss-e085746f07774a1050d9fceffa7e17b262f3132d_GL0.tar.gz) = 101488010
+TIMESTAMP = 1643141811
+SHA256 (gitlab-org-gitlab-foss-abbf44bd6cfb29413b3cf5768b691e5b222b89ea_GL0.tar.gz) = 73e49150461abb2a30190d2cec7a8767b5f40a59e854fd6244878acc597da17e
+SIZE (gitlab-org-gitlab-foss-abbf44bd6cfb29413b3cf5768b691e5b222b89ea_GL0.tar.gz) = 101606916
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index de7b3a0bd6e1..5525869a493c 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,5 +1,14 @@
---- Gemfile.orig	2021-12-21 14:06:23 UTC
+--- Gemfile.orig	2022-01-21 10:23:10 UTC
 +++ Gemfile
+@@ -4,7 +4,7 @@ source 'https://rubygems.org'
+ 
+ gem 'rails', '~> 6.1.4.4'
+ 
+-gem 'bootsnap', '~> 1.9.1', require: false
++gem 'bootsnap', '~> 1.9', require: false
+ 
+ # Responders respond_to and respond_with
+ gem 'responders', '~> 3.0'
 @@ -89,7 +89,7 @@ gem 'gpgme', '~> 2.0.19'
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
@@ -9,15 +18,15 @@
  
  # API
  gem 'grape', '~> 1.5.2'
-@@ -103,7 +103,6 @@ gem 'graphql', '~> 1.11.10'
- # https://gitlab.com/gitlab-org/gitlab/issues/31747
- gem 'graphiql-rails', '~> 1.4.10'
+@@ -100,7 +100,6 @@ gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
+ gem 'graphql', '~> 1.11.10'
+ gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1.0'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -330,117 +329,14 @@ gem 'batch-loader', '~> 2.0.1'
+@@ -328,114 +327,13 @@ gem 'batch-loader', '~> 2.0.1'
  gem 'peek', '~> 1.1'
  
  # Snowplow events tracking
@@ -30,7 +39,7 @@
  gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
  
  gem 'warning', '~> 1.2.0'
- 
+-
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
 -  gem 'solargraph', '~> 0.43', require: false
@@ -86,8 +95,6 @@
 -
 -  gem 'parallel', '~> 1.19', require: false
 -
--  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
--
 -  gem 'test_file_finder', '~> 0.1.3'
 -end
 -
@@ -132,19 +139,6 @@
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
 -end
--
- gem 'octokit', '~> 4.15'
- 
- # https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -488,9 +384,9 @@ gem 'gitaly', '~> 14.4.0.pre.rc43'
- # KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.0.2'
  
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.42.0.pre1'
- 
--gem 'google-protobuf', '~> 3.17.1'
-+gem 'google-protobuf', '~> 3.19.0'
- 
- gem 'toml-rb', '~> 2.0'
+ gem 'octokit', '~> 4.15'
  
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index fedef1cb7416..f0f1142abbb8 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2021-12-21 14:06:23 UTC
+--- config/gitlab.yml.example.orig	2022-01-21 10:23:10 UTC
 +++ config/gitlab.yml.example
-@@ -1133,14 +1133,14 @@ production: &base
+@@ -1139,14 +1139,14 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -18,7 +18,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
-@@ -1189,12 +1189,12 @@ production: &base
+@@ -1195,12 +1195,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -34,7 +34,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1209,13 +1209,13 @@ production: &base
+@@ -1215,13 +1215,13 @@ 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).
@@ -50,7 +50,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1228,13 +1228,13 @@ production: &base
+@@ -1234,13 +1234,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -66,7 +66,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1255,16 +1255,16 @@ production: &base
+@@ -1261,16 +1261,16 @@ production: &base
  
      # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics
      sidekiq_exporter:
@@ -91,7 +91,7 @@
  
      # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics
      # It runs alongside the `/metrics` endpoints to ease the publish of metrics
-@@ -1470,13 +1470,13 @@ test:
+@@ -1488,13 +1488,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
  
    gitaly:
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb
deleted file mode 100644
index a45a225aff28..000000000000
--- a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_json__formatter.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gitlab/sidekiq_logging/json_formatter.rb.orig	2021-10-27 21:47:49 UTC
-+++ lib/gitlab/sidekiq_logging/json_formatter.rb
-@@ -2,6 +2,7 @@
- 
- # This is needed for sidekiq-cluster
- require 'json'
-+require 'sidekiq/job_retry'
- 
- module Gitlab
-   module SidekiqLogging
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb
deleted file mode 100644
index 2d9478dd9e6f..000000000000
--- a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gitlab/sidekiq_logging/structured_logger.rb.orig	2021-10-21 22:00:37 UTC
-+++ lib/gitlab/sidekiq_logging/structured_logger.rb
-@@ -2,6 +2,8 @@
- 
- require 'active_record'
- require 'active_record/log_subscriber'
-+require 'sidekiq/job_logger'
-+require 'sidekiq/job_retry'
- 
- module Gitlab
-   module SidekiqLogging
diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb
deleted file mode 100644
index e81c96f18ce0..000000000000
--- a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__middleware_monitor.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gitlab/sidekiq_middleware/monitor.rb.orig	2021-10-27 21:57:04 UTC
-+++ lib/gitlab/sidekiq_middleware/monitor.rb
-@@ -1,5 +1,7 @@
- # frozen_string_literal: true
- 
-+require 'sidekiq/job_retry'
-+
- module Gitlab
-   module SidekiqMiddleware
-     class Monitor
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index cf177d55075a..6f8456e9722a 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/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.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.6-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/14.7-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.5-14.6-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.6-14.7-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: