1 files changed, 30 insertions, 19 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 17655b4d7498..40dcaafc6844 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	12.2.5
-PORTREVISION=	1
+PORTVERSION=	12.3.1
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -15,10 +15,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
 MY_DEPENDS=	git>=2.21.0:devel/git \
-	gitlab-shell>=9.3.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.8.1:www/gitlab-workhorse \
-	gitaly>=1.59.2:devel/gitaly \
-	gitlab-pages>=1.7.2:www/gitlab-pages \
+	gitlab-shell>=10.0.0:devel/gitlab-shell \
+	gitlab-workhorse>=8.10.0:www/gitlab-workhorse \
+	gitaly>=1.65.0:devel/gitaly \
+	gitlab-pages>=1.9.0:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	rubygem-rails52>=5.2.3:www/rubygem-rails52 \
@@ -54,6 +54,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
 	rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \
 	rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \
+	rubygem-gssapi>0:security/rubygem-gssapi \
 	rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=2.0<3.0:devel/rubygem-akismet \
 	rubygem-invisible_captcha>=0.12.1<0.13.0:graphics/rubygem-invisible_captcha \
@@ -71,7 +72,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \
 	rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=1.0.0<1.1.0:www/rubygem-rack-cors \
-	rubygem-graphql>=1.8.0<1.9.0:devel/rubygem-graphql \
+	rubygem-graphql>=1.9.11<1.10.0:devel/rubygem-graphql \
 	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
 	rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
@@ -82,7 +83,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-mini_magick>0:graphics/rubygem-mini_magick \
 	rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \
 	rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
-	rubygem-fog-google>=1.8<2.0:net/rubygem-fog-google \
+	rubygem-fog-google>=1.9<1.10:net/rubygem-fog-google \
 	rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
 	rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
 	rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
@@ -90,6 +91,11 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \
 	rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
+	rubygem-elasticsearch-model019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-model019 \
+	rubygem-elasticsearch-rails019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-rails019 \
+	rubygem-elasticsearch-api503=5.0.3:textproc/rubygem-elasticsearch-api503 \
+	rubygem-aws-sdk>0:devel/rubygem-aws-sdk \
+	rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \
 	rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \
 	rubygem-deckar01-task_list>=2.2.0<2.3.0:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
@@ -121,7 +127,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \
-	rubygem-gitlab-sidekiq-fetcher=0.5.1:devel/rubygem-gitlab-sidekiq-fetcher \
+	rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
 	rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
 	rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \
@@ -136,13 +142,14 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-redis-rails-rails52>=5.0.2<5.1:www/rubygem-redis-rails-rails52 \
 	rubygem-discordrb-webhooks-blackst0ne>=3.3<4.0:net-im/rubygem-discordrb-webhooks-blackst0ne \
 	rubygem-hipchat>=1.6.0<1.7.0:net-im/rubygem-hipchat \
-	rubygem-jira-ruby>=1.4<2.0:devel/rubygem-jira-ruby \
+	rubygem-jira-ruby>=1.7<2.0:devel/rubygem-jira-ruby \
+	rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \
 	rubygem-flowdock>=0.7<1.0:www/rubygem-flowdock \
 	rubygem-slack-notifier1>=1.5.1<1.6.0:devel/rubygem-slack-notifier1 \
 	rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \
 	rubygem-asana>=0.8.1<0.9.0:www/rubygem-asana \
 	rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
-	rubygem-kubeclient>=4.2.2<4.3.0:www/rubygem-kubeclient \
+	rubygem-kubeclient>=4.4.0<4.5.0:www/rubygem-kubeclient \
 	rubygem-sanitize>=4.6<5.0:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \
@@ -153,7 +160,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \
 	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
 	rubygem-chronic>=0.10.2<0.11.0:devel/rubygem-chronic \
-	rubygem-chronic_duration>=0.10.6<0.11.0:devel/rubygem-chronic_duration \
+	rubygem-gitlab_chronic_duration>=0.10.6.1<0.10.7:devel/rubygem-gitlab_chronic_duration \
 	rubygem-webpack-rails-rails52>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails52 \
 	rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \
 	rubygem-sassc-rails-rails52>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails52 \
@@ -163,29 +170,29 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
 	rubygem-gon-rails52>=6.2<7.0:www/rubygem-gon-rails52 \
 	rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \
-	rubygem-virtus>=1.0.1<1.1.0:devel/rubygem-virtus \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
+	rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \
 	rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails19-rails52>=1.9.7<1.10.0:mail/rubygem-premailer-rails19-rails52 \
-	rubygem-gitlab-labkit>=0.4.2<0.5.0:devel/rubygem-gitlab-labkit \
+	rubygem-gitlab-labkit>=0.5<1.0:devel/rubygem-gitlab-labkit \
 	rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \
 	rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext_i18n_rails_js-rails52>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails52 \
 	rubygem-gettext>=3.2.2<3.3.0:devel/rubygem-gettext \
 	rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \
-	rubygem-peek-rails52>=1.0.1<1.1.0:devel/rubygem-peek-rails52 \
+	rubygem-gitlab-peek-rails52>=0.0.1<0.1.0:devel/rubygem-gitlab-peek-rails52 \
 	rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \
 	rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \
 	rubygem-method_source>=0.8<1.0:devel/rubygem-method_source \
 	rubygem-influxdb>=0.2<1.0:databases/rubygem-influxdb \
-	rubygem-prometheus-client-mmap>=0.9.8<0.10.0:devel/rubygem-prometheus-client-mmap \
+	rubygem-prometheus-client-mmap>=0.9.10<0.10.0:devel/rubygem-prometheus-client-mmap \
 	rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \
 	rubygem-octokit>=4.9<5.0:net/rubygem-octokit \
 	rubygem-mail_room>=0.9.1<0.10.0:mail/rubygem-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
-	rubygem-ruby-prof>=0.17.0<0.18.0:devel/rubygem-ruby-prof \
+	rubygem-ruby-prof>=1.0.0<1.1.0:devel/rubygem-ruby-prof \
 	rubygem-rbtrace>=0.4<1.0:devel/rubygem-rbtrace \
 	rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \
 	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
@@ -194,6 +201,7 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-health_check26-rails52>=2.6.0<2.7.0:devel/rubygem-health_check26-rails52 \
 	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \
+	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-net-ssh>=5.2<6.0,2:security/rubygem-net-ssh \
 	rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
@@ -205,8 +213,11 @@ MY_DEPENDS=	git>=2.21.0:devel/git \
 	rubygem-flipper013>=0.13.0<0.14.0:devel/rubygem-flipper013 \
 	rubygem-flipper-active_record013>=0.13.0<0.14.0:databases/rubygem-flipper-active_record013 \
 	rubygem-flipper-active_support_cache_store013>=0.13.0<0.14.0:devel/rubygem-flipper-active_support_cache_store013 \
+	rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
 	rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
-	rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging
+	rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
+	rubygem-net-dns>=0.9.0<0.10.0:dns/rubygem-net-dns \
+	rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -226,7 +237,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=	09f8edbc29a2e489e7dfefacdcb589affc5fae0f
+GL_COMMIT=	3440d0f6100fc25e052e19801361aa99636d82c1
 
 USERS=	git
 GROUPS=	git