www/gitlab-ce: major update to 15.2.0

Allow devise 4.8 to fix omniauth problem, merge into 15.2.0 commit.

Changelog:
https://about.gitlab.com/releases/2022/07/22/gitlab-15-2-released/

7 files changed, 156 insertions, 68 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index d8cdc97b470c..16059ade4815 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	15.1.4
-PORTREVISION=	3
+PORTVERSION=	15.2.0
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -15,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866
 MY_DEPENDS=	git>=2.32.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
-	gitlab-elasticsearch-indexer>=3.0.0:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=15.1.0:net/gitlab-agent \
+	gitlab-elasticsearch-indexer>=3.0.1:textproc/gitlab-elasticsearch-indexer \
+	gitlab-agent>=15.2.0:net/gitlab-agent \
 	gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
-	gitlab-pages>=1.59.1:www/gitlab-pages \
-	gitlab-shell>=14.7.4:devel/gitlab-shell \
+	gitlab-pages>=1.61.0:www/gitlab-pages \
+	gitlab-shell>=14.9.4:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.14:databases/redis \
 	yarn>=1.10.0:www/yarn \
@@ -37,35 +37,33 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \
 	rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
-	rubygem-devise47-rails61>=4.7.2<4.8:devel/rubygem-devise47-rails61 \
+	rubygem-devise-rails61>=4.7.2<4.9:devel/rubygem-devise-rails61 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \
 	rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \
 	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
 	rubygem-ruby-saml>=1.13.0<1.14:security/rubygem-ruby-saml \
-	rubygem-omniauth1>=1.9.1<2.0:security/rubygem-omniauth1 \
-	rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \
+	rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
+	rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-activedirectory-v2>=1.0<2:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \
-	rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \
+	rubygem-omniauth-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \
 	rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \
 	rubygem-omniauth-alicloud>=1.0.1<1.1:security/rubygem-omniauth-alicloud \
-	rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \
-	rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \
-	rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \
+	rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
+	rubygem-omniauth-github>=1.4.0<3.0:net/rubygem-omniauth-github \
 	rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \
 	rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
-	rubygem-omniauth-saml>=1.10<2.0:security/rubygem-omniauth-saml \
+	rubygem-omniauth-saml>=1.10<3.0:security/rubygem-omniauth-saml \
 	rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \
 	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.9.1<0.10.0:net/rubygem-gitlab-omniauth-openid-connect \
+	rubygem-gitlab-omniauth-openid-connect>=0.9.1<0.11.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 \
 	rubygem-rack-oauth2>=1.19.0<1.20.0:security/rubygem-rack-oauth2 \
-	rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \
+	rubygem-jwt>=2.1.0<3:www/rubygem-jwt \
 	rubygem-gssapi>0:security/rubygem-gssapi \
 	rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
@@ -80,7 +78,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	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 \
-	rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \
+	rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \
 	rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
@@ -88,7 +86,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \
 	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-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
 	rubygem-hashie>=4.1.0:devel/rubygem-hashie \
 	rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
@@ -110,9 +108,9 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
 	rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
 	rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
-	rubygem-aws-sdk-core>=3<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.131.0<3.132:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1<2:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s3>=1.114.0<1.115: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 \
@@ -138,7 +136,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.3<4:textproc/rubygem-diffy \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
-	rubygem-rack223>=2.2.3.0<2.2.4:www/rubygem-rack223 \
+	rubygem-rack>=2.2.4<2.3,3:www/rubygem-rack \
 	rubygem-rack-timeout>=0.6.0<0.7:www/rubygem-rack-timeout \
 	rubygem-puma>=5.6.2<5.7:www/rubygem-puma \
 	rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \
@@ -149,7 +147,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-sidekiq-cron-sidekiq64>=1.2<2.0:devel/rubygem-sidekiq-cron-sidekiq64 \
 	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 \
+	rubygem-fugit>=1.2.1<2:devel/rubygem-fugit \
 	rubygem-httparty>=0.16.4<1:www/rubygem-httparty \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
@@ -158,7 +156,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \
 	rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \
 	rubygem-device_detector>=0:devel/rubygem-device_detector \
-	rubygem-redis44>=4.4.0<4.5:databases/rubygem-redis44 \
+	rubygem-redis>=4.4.0<5:databases/rubygem-redis \
 	rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \
 	rubygem-redis-actionpack52-rails61>=5.2.0<5.3:databases/rubygem-redis-actionpack52-rails61 \
 	rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
@@ -167,12 +165,12 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-flowdock>=0.7<1.0:www/rubygem-flowdock \
 	rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
-	rubygem-asana>=0.10.3<0.11:www/rubygem-asana \
+	rubygem-asana>=0.10.13<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>=6.0<7:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \
-	rubygem-loofah>=2.16.0<3.0:textproc/rubygem-loofah \
+	rubygem-loofah>=2.18.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.5.4<1:devel/rubygem-ruby-magic \
@@ -199,7 +197,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-gitlab-labkit>=0.23.0<0.24: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 \
+	rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \
 	rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \
 	rubygem-gettext>=3.3<4:devel/rubygem-gettext \
@@ -208,10 +206,10 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-snowplow-tracker>=0.6.1<1:devel/rubygem-snowplow-tracker \
 	rubygem-method_source>=1.0<2:devel/rubygem-method_source \
 	rubygem-webrick>=1.6.1:www/rubygem-webrick \
-	rubygem-prometheus-client-mmap>=0.15.0<0.16.0:devel/rubygem-prometheus-client-mmap \
-	rubygem-warning>=1.2.0<1.3:devel/rubygem-warning \
+	rubygem-prometheus-client-mmap>=0.16.0<0.17.0:devel/rubygem-prometheus-client-mmap \
+	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
 	rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder \
-	rubygem-gitlab-dangerfiles>=3.4.0<3.5:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=3.4.3<3.5:devel/rubygem-gitlab-dangerfiles \
 	rubygem-octokit>=4.20<5.0:net/rubygem-octokit \
 	rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
@@ -222,7 +220,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \
 	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
 	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
-	rubygem-oauth21>=1.4.7<2.0:net/rubygem-oauth21 \
+	rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \
 	rubygem-health_check>=3.0<4:devel/rubygem-health_check \
 	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \
@@ -249,15 +247,14 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail \
 	rubygem-lockbox>=0.6.2<0.7:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
-	rubygem-json25>=2.5.1<2.6:devel/rubygem-json25 \
+	rubygem-json>=2.5.1<3:devel/rubygem-json \
 	rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
-	rubygem-oj310>=3.10.6<3.11:devel/rubygem-oj310 \
+	rubygem-oj>=3.13.16<3.14:devel/rubygem-oj \
 	rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
 	rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \
 	rubygem-webauthn>=2.3<3:security/rubygem-webauthn \
 	rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
 	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
-	rubygem-ipynbdiff>=0.4.7<0.4.8:devel/rubygem-ipynbdiff \
 	rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
 	rubygem-parser>=0:devel/rubygem-parser
 
@@ -280,7 +277,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=	39245e886b4dbeac096a3ee649464f293627ff77
+GL_COMMIT=	a876afc5fd85a4ccae6947941884f3913f472ab0
 
 USERS=	git
 GROUPS=	git
@@ -410,7 +407,7 @@ post-install:
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST}
+	#@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST}
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 3434b41389cf..d7b678883391 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659071358
-SHA256 (gitlab-org-gitlab-foss-39245e886b4dbeac096a3ee649464f293627ff77_GL0.tar.gz) = 635ff1aaf0e56dc13ee35f2e0c17581ae9164802186fa338fbe3cbc26646eafe
-SIZE (gitlab-org-gitlab-foss-39245e886b4dbeac096a3ee649464f293627ff77_GL0.tar.gz) = 103097080
+TIMESTAMP = 1658815292
+SHA256 (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07
+SIZE (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index bd6b8e3b25d1..2e93bf1200e2 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2022-06-21 10:16:23 UTC
+--- Gemfile.orig	2022-08-01 14:56:36 UTC
 +++ Gemfile
 @@ -2,7 +2,7 @@
  
@@ -9,17 +9,65 @@
  
  gem 'bootsnap', '~> 1.12.0', require: false
  
-@@ -92,7 +92,7 @@ gem 'gpgme', '~> 2.0.19'
+@@ -29,35 +29,35 @@ gem 'marginalia', '~> 1.10.0'
+ gem 'declarative_policy', '~> 1.1.0'
+ 
+ # Authentication libraries
+-gem 'devise', '~> 4.7.2'
++gem 'devise', '~> 4.7'
+ gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
+ gem 'bcrypt', '~> 3.1', '>= 3.1.14'
+ gem 'doorkeeper', '~> 5.5.0.rc2'
+ gem 'doorkeeper-openid_connect', '~> 1.7.5'
+ gem 'rexml', '~> 3.2.5'
+ gem 'ruby-saml', '~> 1.13.0'
+-gem 'omniauth', '~> 1.8'
+-gem 'omniauth-auth0', '~> 2.0.0'
++gem 'omniauth', '>= 1.8'
++gem 'omniauth-auth0', '~> 3.0.0'
+ gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
+ gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
+ gem 'omniauth-cas3', '~> 1.1.4'
+ gem 'omniauth-dingtalk-oauth2', '~> 1.0'
+ gem 'omniauth-alicloud', '~> 1.0.1'
+-gem 'omniauth-facebook', '~> 4.0.0'
+-gem 'omniauth-github', '~> 1.4'
++gem 'omniauth-facebook', '>= 4.0.0'
++gem 'omniauth-github', '>= 1.4'
+ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
+ gem 'omniauth-google-oauth2', '~> 0.6.0'
+ gem 'omniauth-oauth2-generic', '~> 0.2.2'
+-gem 'omniauth-saml', '~> 1.10'
++gem 'omniauth-saml', '~> 2.1.0'
+ gem 'omniauth-shibboleth', '~> 1.3.0'
+ gem 'omniauth-twitter', '~> 1.4'
+ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
+ gem 'omniauth-authentiq', '~> 0.3.3'
+-gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
++gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
+ gem 'omniauth-salesforce', '~> 1.0.5'
+ gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
+ gem 'rack-oauth2', '~> 1.19.0'
+-gem 'jwt', '~> 2.1.0'
++gem 'jwt', '~> 2.1'
+ 
+ # Kerberos authentication. EE-only
+ gem 'gssapi', group: :kerberos
+@@ -93,7 +93,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
- gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
+ gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
 -gem 'net-ldap', '~> 0.16.3'
 +gem 'net-ldap', '~> 0.16'
  
  # API
  gem 'grape', '~> 1.5.2'
-@@ -207,7 +207,7 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek
- gem 'fugit', '~> 1.2.1'
+@@ -205,10 +205,10 @@ gem 'redis-namespace', '~> 1.8.1'
+ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
+ 
+ # Cron Parser
+-gem 'fugit', '~> 1.2.1'
++gem 'fugit', '~> 1.2'
  
  # HTTP requests
 -gem 'httparty', '~> 0.16.4'
@@ -27,7 +75,16 @@
  
  # Colored output to console
  gem 'rainbow', '~> 3.0'
-@@ -334,89 +334,19 @@ gem 'batch-loader', '~> 2.0.1'
+@@ -233,7 +233,7 @@ gem 'js_regex', '~> 3.7'
+ gem 'device_detector'
+ 
+ # Redis
+-gem 'redis', '~> 4.4.0'
++gem 'redis', '~> 4.4'
+ gem 'connection_pool', '~> 2.0'
+ 
+ # Redis session store
+@@ -335,89 +335,19 @@ gem 'batch-loader', '~> 2.0.1'
  gem 'peek', '~> 1.1'
  
  # Snowplow events tracking
@@ -38,12 +95,12 @@
  gem 'method_source', '~> 1.0', require: false
 -gem 'webrick', '~> 1.6.1', require: false
 +gem 'webrick', '~> 1.6', require: false
- gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
+ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
  
- gem 'warning', '~> 1.2.0'
+ gem 'warning', '~> 1.3.0'
  
 -group :development do
--  gem 'lefthook', '~> 0.8.0', require: false
+-  gem 'lefthook', '~> 1.0.0', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.44.3', require: false
 -
@@ -106,7 +163,7 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 3.4.0', require: false
+   gem 'gitlab-dangerfiles', '~> 3.4.3', require: false
  end
  
 -group :development, :test, :coverage do
@@ -119,7 +176,7 @@
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
-@@ -425,30 +355,6 @@ group :development, :test, :omnibus do
+@@ -426,30 +356,6 @@ group :development, :test, :omnibus do
    gem 'gitlab-license_finder', '~> 6.0', require: false
  end
  
@@ -134,7 +191,7 @@
 -  gem 'capybara-screenshot', '~> 1.0.22'
 -  gem 'selenium-webdriver', '~> 3.142'
 -
--  gem 'shoulda-matchers', '~> 4.0.1', require: false
+-  gem 'shoulda-matchers', '~> 5.1.0', require: false
 -  gem 'email_spec', '~> 2.2.0'
 -  gem 'webmock', '~> 3.9.1'
 -  gem 'rails-controller-testing'
@@ -150,12 +207,19 @@
  gem 'octokit', '~> 4.15'
  
  # Updating this gem version here is deprecated. See:
-@@ -547,5 +453,8 @@ gem 'ipaddress', '~> 0.8.3'
- gem 'parslet', '~> 1.8'
- 
- gem 'ipynbdiff', '0.4.7'
+@@ -534,7 +440,7 @@ gem 'lockbox', '~> 0.6.2'
+ gem 'valid_email', '~> 0.1'
+ 
+ # JSON
+-gem 'json', '~> 2.5.1'
++gem 'json', '~> 2.5'
+ gem 'json_schemer', '~> 0.2.18'
+ gem 'oj', '~> 3.13.19'
+ gem 'multi_json', '~> 1.14.1'
+@@ -554,3 +460,6 @@ gem 'ed25519', '~> 1.3.0'
+ # Error Tracking OpenAPI client
+ # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
+ gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'
 +
 +gem 'parser'
 +
- 
- gem 'ed25519', '~> 1.3.0'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index f4da8a7cd063..a99623890fb9 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	2022-05-20 13:56:26 UTC
+--- config/gitlab.yml.example.orig	2022-07-21 14:01:52 UTC
 +++ config/gitlab.yml.example
-@@ -1160,14 +1160,14 @@ production: &base
+@@ -1158,14 +1158,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
-@@ -1202,12 +1202,12 @@ production: &base
+@@ -1200,12 +1200,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -34,7 +34,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1222,13 +1222,13 @@ production: &base
+@@ -1220,13 +1220,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
-@@ -1241,13 +1241,13 @@ production: &base
+@@ -1239,13 +1239,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -66,9 +66,9 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1268,15 +1268,15 @@ production: &base
+@@ -1266,18 +1266,18 @@ production: &base
  
-     # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics
+     # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
 -    #  enabled: true
 -    #  log_enabled: false
@@ -78,6 +78,9 @@
 +      log_enabled: false
 +      address: localhost
 +      port: 8082
+     #  tls_enabled: false
+     #  tls_cert_path: /path/to/cert.pem
+     #  tls_key_path: /path/to/key.pem
  
      sidekiq_health_checks:
 -    #  enabled: true
@@ -87,9 +90,9 @@
 +      address: localhost
 +      port: 8092
  
-     # 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
-@@ -1496,13 +1496,13 @@ test:
+     # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
+     web_exporter:
+@@ -1502,13 +1502,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
  
    gitaly:
diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec
new file mode 100644
index 000000000000..9001645e1a55
--- /dev/null
+++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec
@@ -0,0 +1,13 @@
+--- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig	2022-08-12 14:45:36 UTC
++++ vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec
+@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
+   gem.test_files    = Dir['spec/**/*.rb']
+   gem.require_paths = ['lib']
+ 
+-  gem.add_dependency 'omniauth', '~> 1.0'
+-  gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
++  gem.add_dependency 'omniauth', '~> 2.0'
++  gem.add_dependency 'omniauth-oauth2', '~> 1.7'
+   gem.add_development_dependency 'rspec', '~> 3.1'
+   gem.add_development_dependency 'rspec-its', '~> 1.0'
+   gem.add_development_dependency 'simplecov'
diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec
new file mode 100644
index 000000000000..106296200a90
--- /dev/null
+++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec
@@ -0,0 +1,11 @@
+--- vendor/gems/omniauth_crowd/omniauth_crowd.gemspec.orig	2022-08-12 14:59:10 UTC
++++ vendor/gems/omniauth_crowd/omniauth_crowd.gemspec
+@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
+   gem.require_paths = ["lib"]
+   gem.version = OmniAuth::Crowd::VERSION
+ 
+-  gem.add_runtime_dependency 'omniauth', '~> 1.0', '< 3'
++  gem.add_runtime_dependency 'omniauth', '>= 1.0', '< 3'
+   gem.add_runtime_dependency 'nokogiri', '>= 1.4.4'
+   gem.add_runtime_dependency 'activesupport', '>= 0'
+   gem.add_development_dependency(%q<rack>, [">= 0"])
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index 2d4413e0ed76..104e066ed222 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/pkg-message
@@ -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/15.0-15.1-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.1-15.2-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: