4 files changed, 25 insertions, 13 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index c33c91c1089e..93ca64fe8685 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	11.10.0
+PORTVERSION=	11.10.1
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 MY_DEPENDS=	git>=2.16.2:devel/git \
 	gitlab-shell>=9.0.0:devel/gitlab-shell \
 	gitlab-workhorse>=8.5.1:www/gitlab-workhorse \
-	gitaly>=1.33.0:devel/gitaly \
+	gitaly>=1.34.0:devel/gitaly \
 	gitlab-pages>=1.5.0:www/gitlab-pages \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
@@ -189,7 +189,7 @@ MY_DEPENDS=	git>=2.16.2:devel/git \
 	rubygem-sshkey>=2.0:security/rubygem-sshkey \
 	rubygem-ed25519>=1.2:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
-	rubygem-gitaly-proto>=1.19.0:net/rubygem-gitaly-proto \
+	rubygem-gitaly-proto>=1.22.0:net/rubygem-gitaly-proto \
 	rubygem-grpc>=1.15.0:net/rubygem-grpc \
 	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
 	rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf \
@@ -228,7 +228,7 @@ USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT=	8a802d1c6b7ee660fbf701b9758ccff85f065e68
+GL_COMMIT=	861fe405571e6900ab9aa9f9da867111d93c69f2
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index a6340d91eb76..2647706c8da8 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555689889
-SHA256 (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 5a9ae0ae2c77280b9270e8f232b5388a48c6c40a9e0351af1f37a30547e028ee
-SIZE (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 62602006
+TIMESTAMP = 1556205648
+SHA256 (gitlab-org-gitlab-ce-861fe405571e6900ab9aa9f9da867111d93c69f2_GL0.tar.gz) = 8a7510d2f7d7b80c0e5bcb5dbbfe3c5c61850c89c470f0b8ab277114f9851589
+SIZE (gitlab-org-gitlab-ce-861fe405571e6900ab9aa9f9da867111d93c69f2_GL0.tar.gz) = 62704487
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 7fca5c31e349..fc7c1f1933b4 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -18,12 +18,10 @@
  
  # JIRA integration
  gem 'jira-ruby', '~> 1.4'
-@@ -305,87 +305,6 @@ group :tracing do
-   # OpenTracing
-   gem 'opentracing', '~> 0.4.3'
+@@ -307,87 +307,6 @@ group :tracing do
    gem 'jaeger-client', '~> 0.10.0'
--end
--
+ end
+ 
 -group :development do
 -  gem 'foreman', '~> 0.84.0'
 -  gem 'brakeman', '~> 4.2', require: false
@@ -103,6 +101,17 @@
 -  gem 'concurrent-ruby', '~> 1.1'
 -  gem 'test-prof', '~> 0.2.5'
 -  gem 'rspec_junit_formatter'
+-end
+-
+ gem 'octokit', '~> 4.9'
+ 
+ gem 'mail_room', '~> 0.9.1'
+@@ -419,7 +338,7 @@ group :ed25519 do
  end
  
- gem 'octokit', '~> 4.9'
+ # Gitaly GRPC client
+-gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
++gem 'gitaly-proto', '~> 1.22.0', require: 'gitaly'
+ 
+ gem 'grpc', '~> 1.15.0'
+ 
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 0b9d70188a42..6425b1965364 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -9004,11 +9004,14 @@
 %%WWWDIR%%/doc/user/admin_area/monitoring/img/health_check_token.png
 %%WWWDIR%%/doc/user/admin_area/settings/continuous_integration.md
 %%WWWDIR%%/doc/user/admin_area/settings/email.md
+%%WWWDIR%%/doc/user/admin_area/settings/external_authorization.md
 %%WWWDIR%%/doc/user/admin_area/settings/img/access_restrictions.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png
+%%WWWDIR%%/doc/user/admin_area/settings/img/classification_label_on_project_page.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/domain_blacklist.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/enforce_terms.png
+%%WWWDIR%%/doc/user/admin_area/settings/img/external_authorization_service_settings.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/import_sources.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/respond_to_terms.png
 %%WWWDIR%%/doc/user/admin_area/settings/img/restricted_url.png