From owner-svn-ports-all@freebsd.org  Tue Nov 28 16:57:44 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A12CDE7139;
 Tue, 28 Nov 2017 16:57:44 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A66B86E65D;
 Tue, 28 Nov 2017 16:57:43 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGvgrr074542;
 Tue, 28 Nov 2017 16:57:42 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGvgKc074536;
 Tue, 28 Nov 2017 16:57:42 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201711281657.vASGvgKc074536@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:57:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455064 - in head/www/gitlab: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tz
X-SVN-Commit-Paths: in head/www/gitlab: . files
X-SVN-Commit-Revision: 455064
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:57:44 -0000

Author: tz
Date: Tue Nov 28 16:57:42 2017
New Revision: 455064
URL: https://svnweb.freebsd.org/changeset/ports/455064

Log:
  www/gitlab: Update from 9.4.7 to 10.1.4
  
  Changelog: https://github.com/gitlabhq/gitlabhq/blob/v10.1.4/CHANGELOG.md
  
  This also fixes some security issues.
  
  Submitted by: Matthias Fechner <idefix@fechner.net>

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/distinfo
  head/www/gitlab/files/patch-Gemfile
  head/www/gitlab/files/patch-config_gitlab.yml.example
  head/www/gitlab/pkg-message
  head/www/gitlab/pkg-plist

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/Makefile	Tue Nov 28 16:57:42 2017	(r455064)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	9.4.7
+PORTVERSION=	10.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
@@ -26,7 +25,7 @@ BUILD_DEPENDS=	gem:devel/ruby-gems
 # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
 # for the options
 RUN_DEPENDS=	git>=2.14.1:devel/git \
-	gitlab-shell>=5.0.4:devel/gitlab-shell\
+	gitlab-shell>=5.9.3:devel/gitlab-shell\
 	gitlab-workhorse>=2.0.0:www/gitlab-workhorse \
 	redis>=2.8.23:databases/redis \
 	npm>=4.3.0:www/npm \
@@ -36,25 +35,27 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-responders>=2.0:www/rubygem-responders \
 	rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
 	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
-	rubygem-rugged>=0.25.1.1:devel/rubygem-rugged \
+	rubygem-rugged>=0.26.0:devel/rubygem-rugged \
+	rubygem-grape-route-helpers>=2.1.0:devel/rubygem-grape-route-helpers \
 	rubygem-faraday>=0.12.0:www/rubygem-faraday \
 	rubygem-devise>=4.2:devel/rubygem-devise \
 	rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
-	rubygem-doorkeeper-openid_connect>=1.1.0:security/rubygem-doorkeeper-openid_connect \
+	rubygem-doorkeeper-openid_connect>=1.2.0:security/rubygem-doorkeeper-openid_connect \
 	rubygem-omniauth>=1.4.2:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
-	rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
+	rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \
 	rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \
 	rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
 	rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \
 	rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
-	rubygem-omniauth-google-oauth2>=0.4.1:net/rubygem-omniauth-google-oauth2 \
+	rubygem-omniauth-google-oauth2>=0.5.2:net/rubygem-omniauth-google-oauth2 \
+	rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \
 	rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
 	rubygem-omniauth-saml>=1.7.0:security/rubygem-omniauth-saml \
 	rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
 	rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
-	rubygem-omniauth-authentiq>=0.3.0:net/rubygem-omniauth-authentiq \
+	rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \
 	rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
 	rubygem-jwt>=1.5.6:www/rubygem-jwt \
 	rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
@@ -65,32 +66,33 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
 	rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \
 	rubygem-browser>=2.2:www/rubygem-browser \
-	rubygem-gitlab_omniauth-ldap>=2.0.2:net/rubygem-gitlab_omniauth-ldap \
-	rubygem-net-ldap>=0:net/rubygem-net-ldap \
+	rubygem-gpgme>=2.0.13:security/rubygem-gpgme \
+	rubygem-gitlab_omniauth-ldap>=2.0.4:net/rubygem-gitlab_omniauth-ldap \
+	rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \
 	rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
 	rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
 	rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
-	rubygem-grape0>=0.19.0:devel/rubygem-grape0 \
+	rubygem-grape>=1.0:devel/rubygem-grape \
 	rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \
-	rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
 	rubygem-rack-cors0>=0.4.0:www/rubygem-rack-cors0 \
-	rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
+	rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
+	rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \
 	rubygem-hamlit>=2.6.1:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.1:www/rubygem-carrierwave \
 	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
-	rubygem-fog-aws0>=0.9:net/rubygem-fog-aws0 \
+	rubygem-fog-aws>=1.4:net/rubygem-fog-aws \
 	rubygem-fog-core>=1.44:devel/rubygem-fog-core \
-	rubygem-fog-google>=0.3:net/rubygem-fog-google \
+	rubygem-fog-google>=0.5:net/rubygem-fog-google \
 	rubygem-fog-local>=0.3:net/rubygem-fog-local \
 	rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
 	rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
-	rubygem-fog-aliyun>=0.1.0:net/rubygem-fog-aliyun \
-	rubygem-google-api-client010>=0.8.6:devel/rubygem-google-api-client010 \
+	rubygem-fog-aliyun>=0.2.0:net/rubygem-fog-aliyun \
+	rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \
 	rubygem-unf>=0.1.4:textproc/rubygem-unf \
 	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
 	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
 	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
-	rubygem-gitlab-markup>=1.5.1:textproc/rubygem-gitlab-markup \
+	rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
 	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
 	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
 	rubygem-rdoc>=4.2:devel/rubygem-rdoc \
@@ -101,13 +103,12 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \
 	rubygem-rouge>=2.0:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
-	rubygem-bootstrap_form>=2.7:devel/rubygem-bootstrap_form \
-	rubygem-nokogiri>=1.8.0:textproc/rubygem-nokogiri  \
+	rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \
+	rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri  \
 	rubygem-diffy>=3.1.0:textproc/rubygem-diffy \
 	rubygem-unicorn>=5.1.0:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \
 	rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
-	rubygem-after_commit_queue>=1.3.0:databases/rubygem-after_commit_queue \
 	rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \
 	rubygem-sidekiq>=5.0.0:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \
@@ -117,13 +118,13 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-httparty>=0.13.3:www/rubygem-httparty \
 	rubygem-rainbow>=2.2:devel/rubygem-rainbow \
 	rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
-	rubygem-re2>=1.0:devel/rubygem-re2 \
+	rubygem-re2>=1.1.1:devel/rubygem-re2 \
 	rubygem-version_sorter>=2.1.0:textproc/rubygem-version_sorter \
 	rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \
 	rubygem-redis>=3.2:databases/rubygem-redis \
 	rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
 	rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \
-	rubygem-jira-ruby>=1.1.2:devel/rubygem-jira-ruby \
+	rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \
 	rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \
 	rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \
 	rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
@@ -131,7 +132,6 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
 	rubygem-kubeclient>=2.2.0:www/rubygem-kubeclient \
 	rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
-	rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
 	rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
 	rubygem-loofah>=2.0.3:textproc/rubygem-loofah \
@@ -139,16 +139,15 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \
 	rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
 	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
-	rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
+	rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \
 	rubygem-oj2>=2.17.4:devel/rubygem-oj2 \
 	rubygem-chronic>=0.10.2:devel/rubygem-chronic \
 	rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
 	rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \
 	rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
 	rubygem-sass-rails5>=5.0.6:textproc/rubygem-sass-rails5 \
-	rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
 	rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
-	rubygem-addressable>=2.3.8:www/rubygem-addressable \
+	rubygem-addressable>=2.5.2:www/rubygem-addressable \
 	rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
 	rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \
 	rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
@@ -158,11 +157,10 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-request_store>=1.3:devel/rubygem-request_store \
 	rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
 	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
-	rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
-	rubygem-base32>=0.3.2:converters/rubygem-base32 \
+	rubygem-base32>=0.3.0:converters/rubygem-base32 \
 	rubygem-sentry-raven>=2.5.3:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails>=1.9.7:mail/rubygem-premailer-rails \
-	rubygem-ruby_parser>=3.8:devel/rubygem-ruby_parser \
+	rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \
 	rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext_i18n_rails_js>=1.2.0:devel/rubygem-gettext_i18n_rails_js \
@@ -170,26 +168,32 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-peek>=1.0.1:devel/rubygem-peek \
 	rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \
 	rubygem-peek-host>=1.0.0:devel/rubygem-peek-host \
-	rubygem-peek-performance_bar>=1.2.1:devel/rubygem-peek-performance_bar \
+	rubygem-peek-performance_bar>=1.3.0:devel/rubygem-peek-performance_bar \
 	rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \
 	rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \
 	rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \
-	rubygem-prometheus-client-mmap>=0.7.0.beta11:devel/rubygem-prometheus-client-mmap \
-	rubygem-raindrops>=0.18:www/rubygem-raindrops \
+	rubygem-prometheus-client-mmap>=0.7.0.beta18:devel/rubygem-prometheus-client-mmap \
 	rubygem-octokit>=4.6.2:net/rubygem-octokit \
 	rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
 	rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
 	rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \
-	rubygem-oauth2>=1.4:net/rubygem-oauth2 \
+	rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \
 	rubygem-paranoia>=2.3.1:databases/rubygem-paranoia \
 	rubygem-health_check>=2.6.0:devel/rubygem-health_check \
 	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
-	rubygem-gitaly>=0.14.0:net/rubygem-gitaly \
+	rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \
+	rubygem-rbnacl>=4.0:security/rubygem-rbnacl \
+	rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
+	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
+	rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \
+	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
 	rubygem-toml-rb>=0.3.15:www/rubygem-toml-rb \
 	rubygem-flipper010>=0.10.2:devel/rubygem-flipper010 \
 	rubygem-flipper-active_record010>=0.10.2:databases/rubygem-flipper-active_record010 \
+	rubygem-lograge>=0.5:www/rubygem-lograge \
+	rubygem-grape_logging>=1.7:devel/rubygem-grape_logging \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 PGSQL_RUN_DEPENDS=	rubygem-pg>=0.18.2:databases/rubygem-pg \
@@ -245,6 +249,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 .include <bsd.port.mk>

Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/distinfo	Tue Nov 28 16:57:42 2017	(r455064)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508319910
-SHA256 (gitlabhq-gitlabhq-v9.4.7_GH0.tar.gz) = e384a51713204f5657c8adafa8bb4e383c5a22734364ae7fd7c62ef3419115ff
-SIZE (gitlabhq-gitlabhq-v9.4.7_GH0.tar.gz) = 32846974
+TIMESTAMP = 1511004904
+SHA256 (gitlabhq-gitlabhq-v10.1.4_GH0.tar.gz) = e8e0fc327378be095b8878282f0ca772ad7d76b66fc62f89be779b3a547e51ef
+SIZE (gitlabhq-gitlabhq-v10.1.4_GH0.tar.gz) = 41725442

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/files/patch-Gemfile	Tue Nov 28 16:57:42 2017	(r455064)
@@ -1,10 +1,10 @@
---- Gemfile.orig	2017-10-16 16:38:24 UTC
+--- Gemfile.orig	2017-10-31 20:21:48 UTC
 +++ Gemfile
-@@ -1,19 +1,19 @@
+@@ -1,49 +1,47 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.8'
-+gem 'rails', '>= 4.2.8'
++gem 'rails', '>=4.2.8'
  gem 'rails-deprecated_sanitizer', '~> 1.0.3'
  
  # Responders respond_to and respond_with
@@ -17,28 +17,30 @@
  gem 'default_value_for', '~> 3.0.0'
  
  # Supported DBs
--gem 'mysql2', '~> 0.3.16', group: :mysql
+-gem 'mysql2', '~> 0.4.5', group: :mysql
 -gem 'pg', '~> 0.18.2', group: :postgres
-+gem 'mysql2', '>= 0.3.16', group: :mysql
-+gem 'pg', '>= 0.18.2', group: :postgres
  
- gem 'rugged', '~> 0.25.1.1'
+ gem 'rugged', '~> 0.26.0'
+ gem 'grape-route-helpers', '~> 2.1.0'
  
-@@ -23,26 +23,25 @@ gem 'faraday', '~> 0.12'
+-gem 'faraday', '~> 0.12'
++gem 'faraday', '>= 0.12'
+ 
+ # Authentication libraries
  gem 'devise', '~> 4.2'
  gem 'doorkeeper', '~> 4.2.0'
- gem 'doorkeeper-openid_connect', '~> 1.1.0'
+ gem 'doorkeeper-openid_connect', '~> 1.2.0'
 -gem 'omniauth', '~> 1.4.2'
 +gem 'omniauth', '>= 1.4.2'
  gem 'omniauth-auth0', '~> 1.4.1'
- gem 'omniauth-azure-oauth2', '~> 0.0.6'
+ gem 'omniauth-azure-oauth2', '~> 0.0.9'
  gem 'omniauth-cas3', '~> 1.1.4'
  gem 'omniauth-facebook', '~> 4.0.0'
  gem 'omniauth-github', '~> 1.1.1'
  gem 'omniauth-gitlab', '~> 1.0.2'
--gem 'omniauth-google-oauth2', '~> 0.4.1'
--gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
-+gem 'omniauth-google-oauth2', '>= 0.4.1'
+-gem 'omniauth-google-oauth2', '~> 0.5.2'
++gem 'omniauth-google-oauth2', '>= 0.5.2'
+ gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
  gem 'omniauth-saml', '~> 1.7.0'
 -gem 'omniauth-shibboleth', '~> 1.2.0'
@@ -46,7 +48,7 @@
 +gem 'omniauth-shibboleth', '>= 1.2.0'
 +gem 'omniauth-twitter', '>= 1.2.0'
  gem 'omniauth_crowd', '~> 2.2.0'
- gem 'omniauth-authentiq', '~> 0.3.0'
+ gem 'omniauth-authentiq', '~> 0.3.1'
 -gem 'rack-oauth2', '~> 1.2.1'
 +gem 'rack-oauth2', '>= 1.2.1'
  gem 'jwt', '~> 1.5.6'
@@ -57,7 +59,7 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
-@@ -69,7 +68,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -73,7 +71,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
  # Language detection
@@ -65,24 +67,25 @@
 +gem 'github-linguist', '>= 4.7.0', require: 'linguist'
  
  # API
- gem 'grape', '~> 0.19.0'
-@@ -83,13 +82,13 @@ gem 'hashie-forbidden_attributes'
- gem 'kaminari', '~> 0.17.0'
+ gem 'grape', '~> 1.0'
+@@ -87,13 +85,13 @@ gem 'hashie-forbidden_attributes'
+ gem 'kaminari', '~> 1.0'
  
  # HAML
 -gem 'hamlit', '~> 2.6.1'
 +gem 'hamlit', '>= 2.6.1'
  
  # Files attachments
- gem 'carrierwave', '~> 1.1'
+-gem 'carrierwave', '~> 1.1'
++gem 'carrierwave', '>= 1.1'
  
  # Drag and Drop UI
 -gem 'dropzonejs-rails', '~> 0.7.1'
 +gem 'dropzonejs-rails', '>= 0.7.1'
  
  # for backups
- gem 'fog-aws', '~> 0.9'
-@@ -98,10 +97,10 @@ gem 'fog-google', '~> 0.5'
+ gem 'fog-aws', '~> 1.4'
+@@ -102,10 +100,10 @@ gem 'fog-google', '~> 0.5'
  gem 'fog-local', '~> 0.3'
  gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
@@ -90,19 +93,19 @@
 +gem 'fog-aliyun', '>= 0.1.0'
  
  # for Google storage
--gem 'google-api-client', '~> 0.8.6'
-+gem 'google-api-client', '>= 0.8.6'
+-gem 'google-api-client', '~> 0.13.6'
++gem 'google-api-client', '>= 0.13.6'
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -111,32 +110,32 @@ gem 'seed-fu', '~> 2.3.5'
+@@ -115,32 +113,32 @@ gem 'seed-fu', '~> 2.3.5'
  
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
 -gem 'deckar01-task_list', '2.0.0'
--gem 'gitlab-markup', '~> 1.5.1'
+-gem 'gitlab-markup', '~> 1.6.2'
 +gem 'deckar01-task_list', '>= 2.0.0'
-+gem 'gitlab-markup', '>= 1.5.1'
++gem 'gitlab-markup', '>= 1.6.2'
  gem 'redcarpet', '~> 3.4'
  gem 'RedCloth', '~> 4.3.2'
  gem 'rdoc', '~> 4.2'
@@ -132,16 +135,16 @@
  # State machine
 -gem 'state_machines-activerecord', '~> 0.4.0'
 +gem 'state_machines-activerecord', '>= 0.4.0'
- # Run events after state machine commits
- gem 'after_commit_queue', '~> 1.3.0'
  
-@@ -146,14 +145,14 @@ gem 'acts-as-taggable-on', '~> 4.0'
+ # Issue tags
+ gem 'acts-as-taggable-on', '~> 4.0'
+@@ -148,17 +146,17 @@ gem 'acts-as-taggable-on', '~> 4.0'
  # Background jobs
  gem 'sidekiq', '~> 5.0'
  gem 'sidekiq-cron', '~> 0.6.0'
 -gem 'redis-namespace', '~> 1.5.2'
 +gem 'redis-namespace', '>= 1.5.2'
- gem 'sidekiq-limit_fetch', '~> 3.4'
+ gem 'sidekiq-limit_fetch', '~> 3.4', require: false
  
  # Cron Parser
  gem 'rufus-scheduler', '~> 3.4'
@@ -151,9 +154,13 @@
 +gem 'httparty', '>= 0.13.3'
  
  # Colored output to console
- gem 'rainbow', '~> 2.2'
-@@ -166,7 +165,7 @@ gem 're2', '~> 1.0.0'
+-gem 'rainbow', '~> 2.2'
++gem 'rainbow', '>= 2.2'
  
+ # GitLab settings
+ gem 'settingslogic', '~> 2.0.9'
+@@ -168,7 +166,7 @@ gem 're2', '~> 1.1.1'
+ 
  # Misc
  
 -gem 'version_sorter', '~> 2.1.0'
@@ -161,7 +168,7 @@
  
  # Cache
  gem 'redis-rails', '~> 5.0.1'
-@@ -176,10 +175,10 @@ gem 'redis', '~> 3.2'
+@@ -178,10 +176,10 @@ gem 'redis', '~> 3.2'
  gem 'connection_pool', '~> 2.0'
  
  # HipChat integration
@@ -169,12 +176,12 @@
 +gem 'hipchat', '>= 1.5.0'
  
  # JIRA integration
--gem 'jira-ruby', '~> 1.1.2'
-+gem 'jira-ruby', '>= 1.1.2'
+-gem 'jira-ruby', '~> 1.4'
++gem 'jira-ruby', '>= 1.4'
  
  # Flowdock integration
  gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -197,7 +196,7 @@ gem 'asana', '~> 0.6.0'
+@@ -199,13 +197,13 @@ gem 'asana', '~> 0.6.0'
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -183,8 +190,6 @@
  
  # d3
  gem 'd3_rails', '~> 3.5.0'
-@@ -206,7 +205,7 @@ gem 'd3_rails', '~> 3.5.0'
- gem 'underscore-rails', '~> 1.8.0'
  
  # Sanitize user input
 -gem 'sanitize', '~> 2.0'
@@ -192,7 +197,7 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -216,7 +215,7 @@ gem 'loofah', '~> 2.0.3'
+@@ -215,7 +213,7 @@ gem 'loofah', '~> 2.0.3'
  gem 'licensee', '~> 8.7.0'
  
  # Protect against bruteforcing
@@ -201,7 +206,7 @@
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.1.0'
-@@ -235,27 +234,27 @@ gem 'chronic', '~> 0.10.2'
+@@ -234,25 +232,25 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.10'
@@ -209,12 +214,11 @@
 +gem 'rack-proxy', '>= 0.6.0'
  
  gem 'sass-rails', '~> 5.0.6'
- gem 'coffee-rails', '~> 4.1.0'
 -gem 'uglifier', '~> 2.7.2'
 +gem 'uglifier', '>= 2.7.2'
  
--gem 'addressable', '~> 2.3.8'
-+gem 'addressable', '>= 2.3.8'
+-gem 'addressable', '~> 2.5.2'
++gem 'addressable', '>= 2.5.2'
  gem 'bootstrap-sass', '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.7'
  gem 'gemojione', '~> 3.3'
@@ -227,8 +231,6 @@
 +gem 'request_store', '>= 1.3'
  gem 'select2-rails', '~> 3.5.9'
  gem 'virtus', '~> 1.0.1'
--gem 'net-ssh', '~> 3.0.1'
-+gem 'net-ssh', '>= 3.0.1'
  gem 'base32', '~> 0.3.0'
  
  # Sentry integration
@@ -237,7 +239,7 @@
  
  gem 'premailer-rails', '~> 1.9.7'
  
-@@ -263,7 +262,7 @@ gem 'premailer-rails', '~> 1.9.7'
+@@ -260,15 +258,14 @@ gem 'premailer-rails', '~> 1.9.7'
  gem 'ruby_parser', '~> 3.8', require: false
  gem 'rails-i18n', '~> 4.0.9'
  gem 'gettext_i18n_rails', '~> 1.8.0'
@@ -246,16 +248,16 @@
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
  # Perf bar
-@@ -271,7 +270,7 @@ gem 'peek', '~> 1.0.1'
+ gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
  gem 'peek-host', '~> 1.0.0'
- gem 'peek-mysql2', '~> 1.1.0', group: :mysql
--gem 'peek-performance_bar', '~> 1.2.1'
-+gem 'peek-performance_bar', '>= 1.2.1'
+-gem 'peek-mysql2', '~> 1.1.0', group: :mysql
+-gem 'peek-performance_bar', '~> 1.3.0'
++gem 'peek-performance_bar', '>= 1.3.0'
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
  gem 'peek-redis', '~> 1.2.0'
-@@ -279,95 +278,16 @@ gem 'peek-sidekiq', '~> 1.0.3'
+@@ -276,119 +273,35 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -264,7 +266,7 @@
 -  gem 'influxdb', '~> 0.2', require: false
 -
    # Prometheus
-   gem 'prometheus-client-mmap', '~>0.7.0.beta11'
+   gem 'prometheus-client-mmap', '~>0.7.0.beta18'
    gem 'raindrops', '~> 0.18'
  end
  
@@ -289,16 +291,17 @@
 -  gem 'pry-rails', '~> 0.3.4'
 -
 -  gem 'awesome_print', '~> 1.2.0', require: false
--  gem 'fuubar', '~> 2.0.0'
+-  gem 'fuubar', '~> 2.2.0'
 -
 -  gem 'database_cleaner', '~> 1.5.0'
 -  gem 'factory_girl_rails', '~> 4.7.0'
--  gem 'rspec-rails', '~> 3.5.0'
+-  gem 'rspec-rails', '~> 3.6.0'
 -  gem 'rspec-retry', '~> 0.4.5'
 -  gem 'spinach-rails', '~> 0.2.1'
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
 -  gem 'rspec_profiling', '~> 0.0.5'
 -  gem 'rspec-set', '~> 0.1.3'
+-  gem 'rspec-parameterized'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.7.0'
@@ -306,7 +309,7 @@
 -  # Generate Fake data
 -  gem 'ffaker', '~> 2.4'
 -
--  gem 'capybara', '~> 2.6.2'
+-  gem 'capybara', '~> 2.15.0'
 -  gem 'capybara-screenshot', '~> 1.0.0'
 -  gem 'poltergeist', '~> 1.9.0'
 -
@@ -314,10 +317,11 @@
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -  gem 'spring-commands-spinach', '~> 1.1.0'
 -
--  gem 'rubocop', '~> 0.47.1', require: false
--  gem 'rubocop-rspec', '~> 1.15.0', require: false
--  gem 'scss_lint', '~> 0.47.0', require: false
--  gem 'haml_lint', '~> 0.21.0', require: false
+-  gem 'rubocop', '~> 0.49.1', require: false
+-  gem 'rubocop-rspec', '~> 1.15.1', require: false
+-  gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
+-  gem 'scss_lint', '~> 0.54.0', require: false
+-  gem 'haml_lint', '~> 0.26.0', require: false
 -  gem 'simplecov', '~> 0.14.0', require: false
 -  gem 'flay', '~> 2.8.0', require: false
 -  gem 'bundler-audit', '~> 0.5.0', require: false
@@ -329,18 +333,21 @@
 -
 -  gem 'activerecord_sane_schema_dumper', '0.2'
 -
--  gem 'stackprof', '~> 0.2.10'
+-  gem 'stackprof', '~> 0.2.10', require: false
+-
+-  gem 'simple_po_parser', '~> 1.1.2', require: false
 -end
 -
 -group :test do
--  gem 'shoulda-matchers', '~> 2.8.0', require: false
+-  gem 'shoulda-matchers', '~> 3.1.2', require: false
 -  gem 'email_spec', '~> 1.6.0'
--  gem 'json-schema', '~> 2.6.2'
+-  gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 2.3.2'
 -  gem 'test_after_commit', '~> 1.1'
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'timecop', '~> 0.8.0'
 -  gem 'concurrent-ruby', '~> 1.0.5'
+-  gem 'test-prof', '~> 0.2.5'
 -end
 -
 -gem 'octokit', '~> 4.6.2'
@@ -353,28 +360,45 @@
  gem 'html2text'
  
  gem 'ruby-prof', '~> 0.16.2'
-@@ -376,10 +296,10 @@ gem 'ruby-prof', '~> 0.16.2'
- gem 'oauth2', '~> 1.4'
  
+ # OAuth
+-gem 'oauth2', '~> 1.4'
++gem 'oauth2', '>= 1.4'
+ 
  # Soft deletion
 -gem 'paranoia', '~> 2.3.1'
 +gem 'paranoia', '>= 2.3.1'
  
  # Health check
 -gem 'health_check', '~> 2.6.0'
-+gem 'health_check', '~> 2.6'
++gem 'health_check', '>= 2.6.0'
  
  # System information
  gem 'vmstat', '~> 2.3.0'
-@@ -388,8 +308,10 @@ gem 'sys-filesystem', '~> 1.1.6'
+ gem 'sys-filesystem', '~> 1.1.6'
+ 
+ # SSH host key support
+-gem 'net-ssh', '~> 4.1.0'
++gem 'net-ssh', '>= 4.1.0'
+ 
+ # Required for ED25519 SSH host key support
+ group :ed25519 do
+@@ -398,9 +311,9 @@ group :ed25519 do
+ end
+ 
  # Gitaly GRPC client
- gem 'gitaly', '~> 0.14.0'
+-gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
++gem 'gitaly-proto', '>= 0.39.0', require: 'gitaly'
  
 -gem 'toml-rb', '~> 0.3.15', require: false
 +gem 'toml-rb', '>= 0.3.15', require: false
  
  # Feature toggles
  gem 'flipper', '~> 0.10.2'
- gem 'flipper-active_record', '~> 0.10.2'
+@@ -409,3 +322,6 @@ gem 'flipper-active_record', '~> 0.10.2'
+ # Structured logging
+ gem 'lograge', '~> 0.5'
+ gem 'grape_logging', '~> 1.7'
 +
 +gem 'rinku'
++

Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab/files/patch-config_gitlab.yml.example	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example	Tue Nov 28 16:57:42 2017	(r455064)
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2017-09-06 21:47:34 UTC
-+++ config/gitlab.yml.example
-@@ -503,8 +503,8 @@ production: &base
+--- config/gitlab.yml.example.orig	2017-10-27 14:35:20.003116000 +0200
++++ config/gitlab.yml.example	2017-10-27 14:37:11.761497000 +0200
+@@ -519,8 +519,8 @@
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -9,10 +9,10 @@
 +        path: /usr/home/git/repositories/
 +        gitaly_address: unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
+         failure_count_threshold: 10 # number of failures before stopping attempts
+         failure_wait_time: 30 # Seconds after an access failure before allowing access again
+@@ -553,12 +553,12 @@
  
-   ## Backup settings
-@@ -532,12 +532,12 @@ production: &base
- 
    ## GitLab Shell settings
    gitlab_shell:
 -    path: /home/git/gitlab-shell/
@@ -27,12 +27,12 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -558,7 +558,7 @@ production: &base
+@@ -579,7 +579,7 @@
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
 -    bin_path: /usr/bin/git
 +    bin_path: /usr/local/bin/git
-     # The next value is the maximum memory size grit can use
-     # Given in number of bytes per git object (e.g. a commit)
-     # This value can be increased if you have very large commits
+ 
+   ## Webpack settings
+   # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running

Modified: head/www/gitlab/pkg-message
==============================================================================
--- head/www/gitlab/pkg-message	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/pkg-message	Tue Nov 28 16:57:42 2017	(r455064)
@@ -3,7 +3,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:
 
-http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/9.3-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/10.1-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
@@ -11,6 +11,6 @@ the instructions in the guide at:
 http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/freebsd_patch_versions.md
 
 If you just installed an major upgrade of GitLab, for example you
-switched from 9.2.x to 9.3.x, please follow the instructions in the guide at:
+switched from 9.4.x to 10.1.x, please follow the instructions in the guide at:
 
-http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.2-to-9.3-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.4-to-10.1-freebsd.md

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Tue Nov 28 16:48:08 2017	(r455063)
+++ head/www/gitlab/pkg-plist	Tue Nov 28 16:57:42 2017	(r455064)
@@ -11,9 +11,11 @@
 %%WWWDIR%%/.gitlab/issue_templates/Bug.md
 %%WWWDIR%%/.gitlab/issue_templates/Feature Proposal.md
 %%WWWDIR%%/.gitlab/issue_templates/Research Proposal.md
+%%WWWDIR%%/.gitlab/merge_request_templates/Database Changes.md
 %%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md
 %%WWWDIR%%/.haml-lint.yml
 %%WWWDIR%%/.mailmap
+%%WWWDIR%%/.nvmrc
 %%WWWDIR%%/.pkgr.yml
 %%WWWDIR%%/.rubocop.yml
 %%WWWDIR%%/.rubocop_todo.yml
@@ -40,6 +42,7 @@
 %%WWWDIR%%/app/assets/images/auth_buttons/github_64.png
 %%WWWDIR%%/app/assets/images/auth_buttons/gitlab_64.png
 %%WWWDIR%%/app/assets/images/auth_buttons/google_64.png
+%%WWWDIR%%/app/assets/images/auth_buttons/signin_with_google.png
 %%WWWDIR%%/app/assets/images/auth_buttons/twitter_64.png
 %%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico
 %%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_created.ico
@@ -1864,6 +1867,21 @@
 %%WWWDIR%%/app/assets/images/i2p-step.svg
 %%WWWDIR%%/app/assets/images/icon-merge-request-unmerged.svg
 %%WWWDIR%%/app/assets/images/icon_anchor.svg
+%%WWWDIR%%/app/assets/images/icon_image_comment.svg
+%%WWWDIR%%/app/assets/images/icon_image_comment@2x.svg
+%%WWWDIR%%/app/assets/images/icons.json
+%%WWWDIR%%/app/assets/images/icons.svg
+%%WWWDIR%%/app/assets/images/illustrations/issues.svg
+%%WWWDIR%%/app/assets/images/illustrations/labels.svg
+%%WWWDIR%%/app/assets/images/illustrations/merge_requests.svg
+%%WWWDIR%%/app/assets/images/illustrations/monitoring/getting_started.svg
+%%WWWDIR%%/app/assets/images/illustrations/monitoring/loading.svg
+%%WWWDIR%%/app/assets/images/illustrations/monitoring/unable_to_connect.svg
+%%WWWDIR%%/app/assets/images/illustrations/pipelines_empty.svg
+%%WWWDIR%%/app/assets/images/illustrations/pipelines_failed.svg
+%%WWWDIR%%/app/assets/images/illustrations/priority_labels.svg
+%%WWWDIR%%/app/assets/images/illustrations/todos_all_done.svg
+%%WWWDIR%%/app/assets/images/illustrations/todos_empty.svg
 %%WWWDIR%%/app/assets/images/koding-logo.svg
 %%WWWDIR%%/app/assets/images/logo.svg
 %%WWWDIR%%/app/assets/images/logo_wordmark.svg
@@ -1880,10 +1898,10 @@
 %%WWWDIR%%/app/assets/images/mailers/gitlab_tanuki_2x.png
 %%WWWDIR%%/app/assets/images/monokai-scheme-preview.png
 %%WWWDIR%%/app/assets/images/msapplication-tile.png
-%%WWWDIR%%/app/assets/images/new_nav.png
+%%WWWDIR%%/app/assets/images/new_repo.png
 %%WWWDIR%%/app/assets/images/no_avatar.png
 %%WWWDIR%%/app/assets/images/no_group_avatar.png
-%%WWWDIR%%/app/assets/images/old_nav.png
+%%WWWDIR%%/app/assets/images/old_repo.png
 %%WWWDIR%%/app/assets/images/onion_skin_sprites.gif
 %%WWWDIR%%/app/assets/images/solarized-dark-scheme-preview.png
 %%WWWDIR%%/app/assets/images/solarized-light-scheme-preview.png
@@ -1968,6 +1986,7 @@
 %%WWWDIR%%/app/assets/javascripts/boards/stores/modal_store.js
 %%WWWDIR%%/app/assets/javascripts/boards/utils/query_data.js
 %%WWWDIR%%/app/assets/javascripts/branches/branches_delete_modal.js
+%%WWWDIR%%/app/assets/javascripts/breadcrumb.js
 %%WWWDIR%%/app/assets/javascripts/breakpoints.js
 %%WWWDIR%%/app/assets/javascripts/broadcast_message.js
 %%WWWDIR%%/app/assets/javascripts/build.js
@@ -1975,9 +1994,8 @@
 %%WWWDIR%%/app/assets/javascripts/build_variables.js
 %%WWWDIR%%/app/assets/javascripts/ci_lint_editor.js
 %%WWWDIR%%/app/assets/javascripts/close_reopen_report_toggle.js
+%%WWWDIR%%/app/assets/javascripts/clusters.js
 %%WWWDIR%%/app/assets/javascripts/comment_type_toggle.js
-%%WWWDIR%%/app/assets/javascripts/commit.js
-%%WWWDIR%%/app/assets/javascripts/commit/file.js
 %%WWWDIR%%/app/assets/javascripts/commit/image_file.js
 %%WWWDIR%%/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
 %%WWWDIR%%/app/assets/javascripts/commit/pipelines/pipelines_table.vue
@@ -1988,6 +2006,9 @@
 %%WWWDIR%%/app/assets/javascripts/commons/polyfills.js
 %%WWWDIR%%/app/assets/javascripts/commons/polyfills/custom_event.js
 %%WWWDIR%%/app/assets/javascripts/commons/polyfills/element.js
+%%WWWDIR%%/app/assets/javascripts/commons/polyfills/event.js
+%%WWWDIR%%/app/assets/javascripts/commons/polyfills/nodelist.js
+%%WWWDIR%%/app/assets/javascripts/commons/vue.js
 %%WWWDIR%%/app/assets/javascripts/compare.js
 %%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js
 %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js
@@ -1995,15 +2016,15 @@
 %%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js
 %%WWWDIR%%/app/assets/javascripts/create_label.js
 %%WWWDIR%%/app/assets/javascripts/create_merge_request_dropdown.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_code_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_issue_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_production_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_review_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_staging_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_test_component.js
-%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/total_time_component.js
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/banner.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/limit_warning_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/total_time_component.vue
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/cycle_analytics_service.js
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js
@@ -2070,11 +2091,11 @@
 %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js
 %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js
 %%WWWDIR%%/app/assets/javascripts/experimental_flags.js
-%%WWWDIR%%/app/assets/javascripts/extensions/array.js
 %%WWWDIR%%/app/assets/javascripts/files_comment_button.js
 %%WWWDIR%%/app/assets/javascripts/filterable_list.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/components/recent_searches_dropdown_content.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/container.js
+%%WWWDIR%%/app/assets/javascripts/filtered_search/dropdown_emoji.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/dropdown_hint.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/dropdown_non_user.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/dropdown_user.js
@@ -2092,19 +2113,22 @@
 %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service_error.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/stores/recent_searches_store.js
 %%WWWDIR%%/app/assets/javascripts/flash.js
+%%WWWDIR%%/app/assets/javascripts/fly_out_nav.js
 %%WWWDIR%%/app/assets/javascripts/gfm_auto_complete.js
 %%WWWDIR%%/app/assets/javascripts/gl_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/gl_field_error.js
 %%WWWDIR%%/app/assets/javascripts/gl_field_errors.js
 %%WWWDIR%%/app/assets/javascripts/gl_form.js
+%%WWWDIR%%/app/assets/javascripts/gpg_badges.js
 %%WWWDIR%%/app/assets/javascripts/graphs/graphs_bundle.js
+%%WWWDIR%%/app/assets/javascripts/graphs/graphs_charts.js
+%%WWWDIR%%/app/assets/javascripts/graphs/graphs_show.js
 %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors.js
 %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_graph.js
 %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_util.js
 %%WWWDIR%%/app/assets/javascripts/group.js
 %%WWWDIR%%/app/assets/javascripts/group_avatar.js
 %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js
-%%WWWDIR%%/app/assets/javascripts/group_name.js
 %%WWWDIR%%/app/assets/javascripts/groups/components/group_folder.vue
 %%WWWDIR%%/app/assets/javascripts/groups/components/group_item.vue
 %%WWWDIR%%/app/assets/javascripts/groups/components/groups.vue
@@ -2116,8 +2140,25 @@
 %%WWWDIR%%/app/assets/javascripts/groups_list.js
 %%WWWDIR%%/app/assets/javascripts/groups_select.js
 %%WWWDIR%%/app/assets/javascripts/header.js
+%%WWWDIR%%/app/assets/javascripts/help/help.js
 %%WWWDIR%%/app/assets/javascripts/helpers/issuables_helper.js
+%%WWWDIR%%/app/assets/javascripts/helpers/user_feature_helper.js
+%%WWWDIR%%/app/assets/javascripts/how_to_merge.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/helpers/badge_helper.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/helpers/comment_indicator_helper.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/helpers/dom_helper.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/helpers/index.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/helpers/utils_helper.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/image_badge.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/image_diff.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/init_discussion_tab.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/replaced_image_diff.js
+%%WWWDIR%%/app/assets/javascripts/image_diff/view_types.js
 %%WWWDIR%%/app/assets/javascripts/importer_status.js
+%%WWWDIR%%/app/assets/javascripts/init_changes_dropdown.js
+%%WWWDIR%%/app/assets/javascripts/init_issuable_sidebar.js
+%%WWWDIR%%/app/assets/javascripts/init_legacy_filters.js
+%%WWWDIR%%/app/assets/javascripts/init_notes.js
 %%WWWDIR%%/app/assets/javascripts/integrations/index.js
 %%WWWDIR%%/app/assets/javascripts/integrations/integration_settings_form.js
 %%WWWDIR%%/app/assets/javascripts/issuable/auto_width_dropdown_select.js
@@ -2131,10 +2172,8 @@
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/description.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/edit_actions.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/edited.vue
-%%WWWDIR%%/app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/fields/description.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/fields/description_template.vue
-%%WWWDIR%%/app/assets/javascripts/issue_show/components/fields/project_move.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/fields/title.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/form.vue
 %%WWWDIR%%/app/assets/javascripts/issue_show/components/locked_warning.vue
@@ -2158,31 +2197,36 @@
 %%WWWDIR%%/app/assets/javascripts/labels_select.js
 %%WWWDIR%%/app/assets/javascripts/landing.js
 %%WWWDIR%%/app/assets/javascripts/layout_nav.js
+%%WWWDIR%%/app/assets/javascripts/lazy_loader.js
 %%WWWDIR%%/app/assets/javascripts/lib/ace.js
 %%WWWDIR%%/app/assets/javascripts/lib/ace/ace_config_paths.js.erb
 %%WWWDIR%%/app/assets/javascripts/lib/utils/accessor.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/ajax_cache.js
-%%WWWDIR%%/app/assets/javascripts/lib/utils/animate.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/axios_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/cache.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/common_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/constants.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/csrf.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/datefix.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/datetime_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/dom_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/http_status.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/notify.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/number_utils.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/poll.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/pretty_time.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/regexp.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/simple_poll.js
+%%WWWDIR%%/app/assets/javascripts/lib/utils/sticky.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/text_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/type_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/url_utility.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/users_cache.js
 %%WWWDIR%%/app/assets/javascripts/line_highlighter.js
 @(git,,) %%WWWDIR%%/app/assets/javascripts/locale/index.js
+%%WWWDIR%%/app/assets/javascripts/locale/sprintf.js
 %%WWWDIR%%/app/assets/javascripts/logo.js
 %%WWWDIR%%/app/assets/javascripts/main.js
 %%WWWDIR%%/app/assets/javascripts/member_expiration_date.js
@@ -2200,20 +2244,22 @@
 %%WWWDIR%%/app/assets/javascripts/milestone.js
 %%WWWDIR%%/app/assets/javascripts/milestone_select.js
 %%WWWDIR%%/app/assets/javascripts/mini_pipeline_graph_dropdown.js
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_column.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_deployment.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_flag.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_legends.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_row.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/components/monitoring_state.vue
-%%WWWDIR%%/app/assets/javascripts/monitoring/constants.js
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/dashboard.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/empty_state.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/deployment.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/flag.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/legend.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/path.vue
+%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph_group.vue
 %%WWWDIR%%/app/assets/javascripts/monitoring/event_hub.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/monitoring_bundle.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/services/monitoring_service.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/stores/monitoring_store.js
+%%WWWDIR%%/app/assets/javascripts/monitoring/utils/date_time_formatters.js
 %%WWWDIR%%/app/assets/javascripts/monitoring/utils/measurements.js
+%%WWWDIR%%/app/assets/javascripts/monitoring/utils/multiple_time_series.js
 %%WWWDIR%%/app/assets/javascripts/namespace_select.js
 %%WWWDIR%%/app/assets/javascripts/network/branch_graph.js
 %%WWWDIR%%/app/assets/javascripts/network/network.js
@@ -2221,6 +2267,7 @@
 %%WWWDIR%%/app/assets/javascripts/network/raphael.js
 %%WWWDIR%%/app/assets/javascripts/new_branch_form.js
 %%WWWDIR%%/app/assets/javascripts/new_commit_form.js
+%%WWWDIR%%/app/assets/javascripts/new_sidebar.js
 %%WWWDIR%%/app/assets/javascripts/notebook/cells/code.vue
 %%WWWDIR%%/app/assets/javascripts/notebook/cells/code/index.vue
 %%WWWDIR%%/app/assets/javascripts/notebook/cells/index.js
@@ -2232,6 +2279,34 @@
 %%WWWDIR%%/app/assets/javascripts/notebook/index.vue
 %%WWWDIR%%/app/assets/javascripts/notebook/lib/highlight.js
 %%WWWDIR%%/app/assets/javascripts/notes.js
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_comment_form.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_discussion.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_actions.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_attachment.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_awards_list.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_body.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_edited_text.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_form.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_header.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_note_signed_out_widget.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_notes_app.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_placeholder_note.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_placeholder_system_note.vue
+%%WWWDIR%%/app/assets/javascripts/notes/components/issue_system_note.vue
+%%WWWDIR%%/app/assets/javascripts/notes/constants.js
+%%WWWDIR%%/app/assets/javascripts/notes/event_hub.js
+%%WWWDIR%%/app/assets/javascripts/notes/index.js
+%%WWWDIR%%/app/assets/javascripts/notes/mixins/autosave.js
+%%WWWDIR%%/app/assets/javascripts/notes/mixins/issuable_state.js
+%%WWWDIR%%/app/assets/javascripts/notes/services/issue_notes_service.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/actions.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/getters.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/index.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/mutation_types.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/mutations.js
+%%WWWDIR%%/app/assets/javascripts/notes/stores/utils.js
 %%WWWDIR%%/app/assets/javascripts/notifications_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/notifications_form.js
 %%WWWDIR%%/app/assets/javascripts/oauth_remember_me.js
@@ -2241,7 +2316,7 @@
 %%WWWDIR%%/app/assets/javascripts/pdf/page/index.vue
 %%WWWDIR%%/app/assets/javascripts/performance_bar.js
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/interval_pattern_input.vue
-%%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules_callout.js
+%%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules_callout.vue

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***