From owner-svn-ports-head@freebsd.org  Wed Sep 13 14:15:10 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 812AFE23203;
 Wed, 13 Sep 2017 14:15:10 +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 3410666306;
 Wed, 13 Sep 2017 14:15:10 +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 v8DEF9sV052102;
 Wed, 13 Sep 2017 14:15:09 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DEF8sO052094;
 Wed, 13 Sep 2017 14:15:08 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201709131415.v8DEF8sO052094@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: Wed, 13 Sep 2017 14:15:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r449793 - 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: 449793
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Sep 2017 14:15:10 -0000

Author: tz
Date: Wed Sep 13 14:15:08 2017
New Revision: 449793
URL: https://svnweb.freebsd.org/changeset/ports/449793

Log:
  www/gitlab: Update from 9.2.10 to 9.3.10
  
  Changelog: https://github.com/gitlabhq/gitlabhq/blob/v9.3.10/CHANGELOG.md
  
  We now add full support for gitaly and add the basics for later support
  of gitlab-pages.
  
  Reviewed by: Matthias Fechner <idefix@fechner.net>

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

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/Makefile	Wed Sep 13 14:15:08 2017	(r449793)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	9.2.10
+PORTVERSION=	9.3.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
@@ -83,11 +82,12 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	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-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_list1>=1.0.6:www/rubygem-deckar01-task_list1 \
+	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.5.1:textproc/rubygem-gitlab-markup \
 	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
 	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
@@ -107,10 +107,10 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	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.4.4:devel/rubygem-sidekiq-cron \
+	rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
 	rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \
-	rubygem-rufus-scheduler>=3.1.10:devel/rubygem-rufus-scheduler \
+	rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \
 	rubygem-httparty>=0.13.3:www/rubygem-httparty \
 	rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \
 	rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
@@ -158,11 +158,19 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
 	rubygem-base32>=0.3.2:converters/rubygem-base32 \
 	rubygem-sentry-raven>=2.4.0:devel/rubygem-sentry-raven \
-	rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
+	rubygem-premailer-rails>=1.9.7:mail/rubygem-premailer-rails \
 	rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
 	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 \
 	rubygem-gettext>=3.2.2:devel/rubygem-gettext \
+	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-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.beta5: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 \
@@ -173,12 +181,16 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	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.6.0:net/rubygem-gitaly \
+	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
 	rubygem-toml-rb>=0.3.15:www/rubygem-toml-rb \
+	rubygem-flipper>=0.10.2:devel/rubygem-flipper \
+	rubygem-flipper-active_record>=0.10.2:databases/rubygem-flipper-active_record \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
-PGSQL_RUN_DEPENDS=	rubygem-pg>=0.18.2:databases/rubygem-pg
-MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.5:databases/rubygem-mysql2
+PGSQL_RUN_DEPENDS=	rubygem-pg>=0.18.2:databases/rubygem-pg \
+	rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg
+MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \
+	rubygem-peek-mysql2>=1.1.0:databases/rubygem-peek-mysql2
 
 USE_RUBY=	yes
 
@@ -195,10 +207,12 @@ NO_BUILD=	yes
 
 post-patch-MYSQL-on:
 	${ECHO} "gem 'mysql2', '>= 0.3.16', group: :mysql" >> ${WRKSRC}/Gemfile
+	${ECHO} "gem 'peek-mysql2', '~> 1.1.0', group: :mysql" >> ${WRKSRC}/Gemfile
 	${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
 
 post-patch-PGSQL-on:
 	${ECHO} "gem 'pg', '>= 0.18.2', group: :postgres" >> ${WRKSRC}/Gemfile
+	${ECHO} "gem 'peek-pg', '~> 1.3.0', group: :postgres" >> ${WRKSRC}/Gemfile
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 
 do-install:

Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/distinfo	Wed Sep 13 14:15:08 2017	(r449793)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502437209
-SHA256 (gitlabhq-gitlabhq-v9.2.10_GH0.tar.gz) = b6125f7664e70008ad05f950cf3fe55714dc2f3d9e4b57f0561546608d03dc34
-SIZE (gitlabhq-gitlabhq-v9.2.10_GH0.tar.gz) = 30982505
+TIMESTAMP = 1502787428
+SHA256 (gitlabhq-gitlabhq-v9.3.10_GH0.tar.gz) = 28d12ef9bdba2359f17b38b9c058b049b13f8a66173ad005ec08480be8cbebe3
+SIZE (gitlabhq-gitlabhq-v9.3.10_GH0.tar.gz) = 31758906

Modified: head/www/gitlab/files/gitlab.in
==============================================================================
--- head/www/gitlab/files/gitlab.in	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/files/gitlab.in	Wed Sep 13 14:15:08 2017	(r449793)
@@ -60,7 +60,16 @@ gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhors
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
 gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend $gitlab_authBackend -authSocket $rails_socket -documentRoot $app_root/public"
 gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
+gitlab_pages_enabled=false
+gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd)
+gitlab_pages_pid_path="$pid_path/gitlab-pages.pid"
+gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090"
+gitlab_pages_log="$app_root/log/gitlab-pages.log"
 shell_path="/bin/bash"
+gitaly_enabled=true
+gitaly_dir="/usr/local/share/gitaly"
+gitaly_pid_path="$pid_path/gitaly.pid"
+gitaly_log="$app_root/log/gitaly.log"
 
 # Read configuration variable file if it is present
 test -f /etc/default/gitlab && . /etc/default/gitlab
@@ -107,13 +116,27 @@ check_pids(){
       mpid=0
     fi
   fi
+  if [ "$gitlab_pages_enabled" = true ]; then
+    if [ -f "$gitlab_pages_pid_path" ]; then
+      gppid=$(cat "$gitlab_pages_pid_path")
+    else
+      gppid=0
+    fi
+  fi
+  if [ "$gitaly_enabled" = true ]; then
+    if [ -f "$gitaly_pid_path" ]; then
+      gapid=$(cat "$gitaly_pid_path")
+    else
+      gapid=0
+    fi
+  fi
 }
 
 ## Called when we have started the two processes and are waiting for their pid files.
 wait_for_pids(){
   # We are sleeping a bit here mostly because sidekiq is slow at writing its pid
   i=0;
-  while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; }; do
+  while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; } || { [ "$gitlab_pages_enabled" = true ] && [ ! -f $gitlab_pages_pid_path ]; } || { [ "$gitaly_enabled" = true ] && [ ! -f $gitaly_pid_path ]; }; do
     sleep 0.1;
     i=$((i+1))
     if [ $((i%10)) = 0 ]; then
@@ -162,7 +185,23 @@ check_status(){
       mail_room_status="-1"
     fi
   fi
-  if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && [ $gitlab_workhorse_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ]; }; then
+  if [ "$gitlab_pages_enabled" = true ]; then
+    if [ $gppid -ne 0 ]; then
+      kill -0 "$gppid" 2>/dev/null
+      gitlab_pages_status="$?"
+    else
+      gitlab_pages_status="-1"
+    fi
+  fi
+  if [ "$gitaly_enabled" = true ]; then
+    if [ $gapid -ne 0 ]; then
+      kill -0 "$gapid" 2>/dev/null
+      gitaly_status="$?"
+    else
+      gitaly_status="-1"
+    fi
+  fi
+  if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && [ $gitlab_workhorse_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ]; } && { [ "$gitlab_pages_enabled" != true ] || [ $gitlab_pages_status = 0 ]; } && { [ "$gitaly_enabled" != true ] || [ $gitaly_status = 0 ]; }; then
     gitlab_status=0
   else
     # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
@@ -191,7 +230,7 @@ check_stale_pids(){
     fi
   fi
   if [ "$hpid" != "0" ] && [ "$gitlab_workhorse_status" != "0" ]; then
-    echo "Removing stale gitlab-workhorse pid. This is most likely caused by gitlab-workhorse crashing the last time it ran."
+    echo "Removing stale GitLab Workhorse pid. This is most likely caused by GitLab Workhorse crashing the last time it ran."
     if ! rm "$gitlab_workhorse_pid_path"; then
       echo "Unable to remove stale pid, exiting"
       exit 1
@@ -204,12 +243,26 @@ check_stale_pids(){
       exit 1
     fi
   fi
+  if [ "$gitlab_pages_enabled" = true ] && [ "$gppid" != "0" ] && [ "$gitlab_pages_status" != "0" ]; then
+    echo "Removing stale GitLab Pages job dispatcher pid. This is most likely caused by GitLab Pages crashing the last time it ran."
+    if ! rm "$gitlab_pages_pid_path"; then
+      echo "Unable to remove stale pid, exiting"
+      exit 1
+    fi
+  fi
+  if [ "$gitaly_enabled" = true ] && [ "$gapid" != "0" ] && [ "$gitaly_status" != "0" ]; then
+    echo "Removing stale Gitaly pid. This is most likely caused by Gitaly crashing the last time it ran."
+    if ! rm "$gitaly_pid_path"; then
+      echo "Unable to remove stale pid, exiting"
+      exit 1
+    fi
+  fi
 }
 
 ## If no parts of the service is running, bail out.
 exit_if_not_running(){
   check_stale_pids
-  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then
     echo "GitLab is not running."
     exit
   fi
@@ -226,11 +279,17 @@ start_gitlab() {
     echo "Starting GitLab Sidekiq"
   fi
   if [ "$gitlab_workhorse_status" != "0" ]; then
-    echo "Starting gitlab-workhorse"
+    echo "Starting GitLab Workhorse"
   fi
   if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" != "0" ]; then
     echo "Starting GitLab MailRoom"
   fi
+  if [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" != "0" ]; then
+    echo "Starting GitLab Pages"
+  fi
+  if [ "$gitaly_enabled" = true ] && [ "$gitaly_status" != "0" ]; then
+    echo "Starting Gitaly"
+  fi
 
   # Then check if the service is running. If it is: don't start again.
   if [ "$web_status" = "0" ]; then
@@ -250,7 +309,7 @@ start_gitlab() {
   fi
 
   if [ "$gitlab_workhorse_status" = "0" ]; then
-    echo "The gitlab-workhorse is already running with pid $spid, not restarting"
+    echo "The GitLab Workhorse is already running with pid $hpid, not restarting"
   else
     # No need to remove a socket, gitlab-workhorse does this itself.
     # Because gitlab-workhorse has multiple executables we need to fix
@@ -270,6 +329,25 @@ start_gitlab() {
     fi
   fi
 
+  if [ "$gitlab_pages_enabled" = true ]; then
+    if [ "$gitlab_pages_status" = "0" ]; then
+      echo "The GitLab Pages is already running with pid $gppid, not restarting"
+    else
+      $app_root/bin/daemon_with_pidfile $gitlab_pages_pid_path  \
+          $gitlab_pages_dir/gitlab-pages $gitlab_pages_options \
+        >> $gitlab_pages_log 2>&1 &
+    fi
+  fi
+
+  if [ "$gitaly_enabled" = true ]; then
+    if [ "$gitaly_status" = "0" ]; then
+      echo "Gitaly is already running with pid $gapid, not restarting"
+    else
+      $app_root/bin/daemon_with_pidfile $gitaly_pid_path \
+          $gitaly_dir/bin/gitaly $gitaly_dir/config.toml >> $gitaly_log 2>&1 &
+    fi
+  fi
+
   # Wait for the pids to be planted
   wait_for_pids
   # Finally check the status to tell wether or not GitLab is running
@@ -289,20 +367,28 @@ stop_gitlab() {
     RAILS_ENV=$RAILS_ENV bin/background_jobs stop
   fi
   if [ "$gitlab_workhorse_status" = "0" ]; then
-    echo "Shutting down gitlab-workhorse"
+    echo "Shutting down GitLab Workhorse"
     kill -- $(cat $gitlab_workhorse_pid_path)
   fi
   if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; then
     echo "Shutting down GitLab MailRoom"
     RAILS_ENV=$RAILS_ENV bin/mail_room stop
   fi
+  if [ "$gitlab_pages_status" = "0" ]; then
+    echo "Shutting down gitlab-pages"
+    kill -- $(cat $gitlab_pages_pid_path)
+  fi
+  if [ "$gitaly_status" = "0" ]; then
+    echo "Shutting down Gitaly"
+    kill -- $(cat $gitaly_pid_path)
+  fi
 
   # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
-  while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; }; do
+  while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; do
     sleep 1
     check_status
     printf "."
-    if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
+    if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then
       printf "\n"
       break
     fi
@@ -316,6 +402,8 @@ stop_gitlab() {
   if [ "$mail_room_enabled" = true ]; then
     rm "$mail_room_pid_path" 2>/dev/null
   fi
+  rm -f "$gitlab_pages_pid_path"
+  rm -f "$gitaly_pid_path"
 
   print_status
 }
@@ -323,7 +411,7 @@ stop_gitlab() {
 ## Prints the status of GitLab and its components.
 print_status() {
   check_status
-  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" != "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" != "0" ]; }; then
     echo "GitLab is not running."
     return
   fi
@@ -338,9 +426,9 @@ print_status() {
       printf "The GitLab Sidekiq job dispatcher is \033[31mnot running\033[0m.\n"
   fi
   if [ "$gitlab_workhorse_status" = "0" ]; then
-      echo "The gitlab-workhorse with pid $hpid is running."
+      echo "The GitLab Workhorse with pid $hpid is running."
   else
-      printf "The gitlab-workhorse is \033[31mnot running\033[0m.\n"
+      printf "The GitLab Workhorse is \033[31mnot running\033[0m.\n"
   fi
   if [ "$mail_room_enabled" = true ]; then
     if [ "$mail_room_status" = "0" ]; then
@@ -349,7 +437,21 @@ print_status() {
         printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
     fi
   fi
-  if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && [ "$gitlab_workhorse_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; }; then
+  if [ "$gitlab_pages_enabled" = true ]; then
+    if [ "$gitlab_pages_status" = "0" ]; then
+        echo "The GitLab Pages with pid $gppid is running."
+    else
+        printf "The GitLab Pages is \033[31mnot running\033[0m.\n"
+    fi
+  fi
+  if [ "$gitaly_enabled" = true ]; then
+    if [ "$gitaly_status" = "0" ]; then
+        echo "Gitaly with pid $gapid is running."
+    else
+        printf "Gitaly is \033[31mnot running\033[0m.\n"
+    fi
+  fi
+  if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && [ "$gitlab_workhorse_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; } && { [ "$gitlab_pages_enabled" != true ] || [ "$gitlab_pages_status" = "0" ]; } && { [ "$gitaly_enabled" != true ] || [ "$gitaly_status" = "0" ]; }; then
     printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
   fi
 }
@@ -380,7 +482,7 @@ reload_gitlab(){
 ## Restarts Sidekiq and Unicorn.
 restart_gitlab(){
   check_status
-  if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; }; then
+  if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; then
     stop_gitlab
   fi
   start_gitlab

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/files/patch-Gemfile	Wed Sep 13 14:15:08 2017	(r449793)
@@ -1,5 +1,5 @@
---- Gemfile.orig	2017-07-20 19:20:16.056471000 +0200
-+++ Gemfile	2017-07-20 19:28:14.691625000 +0200
+--- Gemfile.orig	2017-08-09 13:53:30 UTC
++++ Gemfile
 @@ -1,48 +1,43 @@
  source 'https://rubygems.org'
  
@@ -57,7 +57,7 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
-@@ -68,7 +63,7 @@
+@@ -68,7 +63,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
  
  # Language detection
@@ -66,7 +66,7 @@
  
  # API
  gem 'grape', '~> 0.19.0'
-@@ -82,13 +77,13 @@
+@@ -82,13 +77,13 @@ gem 'hashie-forbidden_attributes'
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
@@ -83,8 +83,12 @@
  
  # for backups
  gem 'fog-aws', '~> 0.9'
-@@ -99,7 +94,7 @@
+@@ -97,10 +92,10 @@ gem 'fog-google', '~> 0.5'
+ gem 'fog-local', '~> 0.3'
+ gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
+-gem 'fog-aliyun', '~> 0.1.0'
++gem 'fog-aliyun', '>= 0.1.0'
  
  # for Google storage
 -gem 'google-api-client', '~> 0.8.6'
@@ -92,13 +96,13 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -109,34 +104,34 @@
+@@ -110,34 +105,34 @@ gem 'seed-fu', '~> 2.3.5'
  
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
--gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
+-gem 'deckar01-task_list', '2.0.0'
 -gem 'gitlab-markup', '~> 1.5.1'
-+gem 'deckar01-task_list', '>=1.0.6', require: 'task_list/railtie'
++gem 'deckar01-task_list', '>= 2.0.0'
 +gem 'gitlab-markup', '>= 1.5.1'
  gem 'redcarpet', '~> 3.4'
  gem 'RedCloth', '~> 4.3.2'
@@ -106,17 +110,17 @@
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
 -gem 'wikicloth', '0.8.1'
-+gem 'wikicloth', '>=0.8.1'
++gem 'wikicloth', '>= 0.8.1'
  gem 'asciidoctor', '~> 1.5.2'
 -gem 'asciidoctor-plantuml', '0.0.7'
-+gem 'asciidoctor-plantuml', '>=0.0.7'
++gem 'asciidoctor-plantuml', '>= 0.0.7'
  gem 'rouge', '~> 2.0'
  gem 'truncato', '~> 0.7.8'
  
  # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
  # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
 -gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
-+gem 'nokogiri', '>= 1.6.7', '>= 1.6.7.2'
++gem 'nokogiri', '>= 1.6.7.2'
  
  # Diffs
 -gem 'diffy', '~> 3.1.0'
@@ -135,19 +139,9 @@
  # Run events after state machine commits
  gem 'after_commit_queue', '~> 1.3.0'
  
-@@ -145,18 +140,18 @@
+@@ -154,10 +149,10 @@ gem 'sidekiq-limit_fetch', '~> 3.4'
+ gem 'rufus-scheduler', '~> 3.4'
  
- # Background jobs
- gem 'sidekiq', '~> 5.0'
--gem 'sidekiq-cron', '~> 0.4.4'
-+gem 'sidekiq-cron', '>= 0.4.4'
- gem 'redis-namespace', '~> 1.5.2'
- gem 'sidekiq-limit_fetch', '~> 3.4'
- 
- # Cron Parser
--gem 'rufus-scheduler', '~> 3.1.10'
-+gem 'rufus-scheduler', '>= 3.1.10'
- 
  # HTTP requests
 -gem 'httparty', '~> 0.13.3'
 +gem 'httparty', '>= 0.13.3'
@@ -158,7 +152,7 @@
  
  # GitLab settings
  gem 'settingslogic', '~> 2.0.9'
-@@ -166,7 +161,7 @@
+@@ -167,7 +162,7 @@ gem 're2', '~> 1.0.0'
  
  # Misc
  
@@ -167,7 +161,7 @@
  
  # Cache
  gem 'redis-rails', '~> 5.0.1'
-@@ -176,10 +171,10 @@
+@@ -177,10 +172,10 @@ gem 'redis', '~> 3.2'
  gem 'connection_pool', '~> 2.0'
  
  # HipChat integration
@@ -180,7 +174,7 @@
  
  # Flowdock integration
  gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -197,7 +192,7 @@
+@@ -198,7 +193,7 @@ gem 'asana', '~> 0.6.0'
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -189,7 +183,7 @@
  
  # d3
  gem 'd3_rails', '~> 3.5.0'
-@@ -206,7 +201,7 @@
+@@ -207,7 +202,7 @@ gem 'd3_rails', '~> 3.5.0'
  gem 'underscore-rails', '~> 1.8.0'
  
  # Sanitize user input
@@ -198,7 +192,7 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -216,7 +211,7 @@
+@@ -217,7 +212,7 @@ gem 'loofah', '~> 2.0.3'
  gem 'licensee', '~> 8.7.0'
  
  # Protect against bruteforcing
@@ -207,7 +201,7 @@
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.1.0'
-@@ -235,129 +230,47 @@
+@@ -236,143 +231,63 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.10'
@@ -240,7 +234,7 @@
 -gem 'sentry-raven', '~> 2.4.0'
 +gem 'sentry-raven', '>= 2.4.0'
  
- gem 'premailer-rails', '~> 1.9.0'
+ gem 'premailer-rails', '~> 1.9.7'
  
  # I18n
  gem 'ruby_parser', '~> 3.8.4', require: false
@@ -249,13 +243,28 @@
 +gem 'gettext_i18n_rails_js', '>= 1.2.0'
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
--# Metrics
--group :metrics do
+ # Perf bar
+ 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-pg', '~> 1.3.0', group: :postgres
++gem 'peek-performance_bar', '>= 1.2.1'
+ gem 'peek-rblineprof', '~> 0.2.0'
+ gem 'peek-redis', '~> 1.2.0'
+ gem 'peek-sidekiq', '~> 1.0.3'
+ 
+ # Metrics
+ group :metrics do
 -  gem 'allocations', '~> 1.0', require: false, platform: :mri
 -  gem 'method_source', '~> 0.8', require: false
 -  gem 'influxdb', '~> 0.2', require: false
--end
 -
+   # Prometheus
+   gem 'prometheus-client-mmap', '~>0.7.0.beta5'
+ end
+ 
 -group :development do
 -  gem 'foreman', '~> 0.78.0'
 -  gem 'brakeman', '~> 3.6.0', require: false
@@ -330,7 +339,7 @@
 -  gem 'timecop', '~> 0.8.0'
 -  gem 'concurrent-ruby', '~> 1.0.5'
 -end
--
+ 
 -gem 'octokit', '~> 4.6.2'
 +gem 'octokit', '>= 4.6.2'
  
@@ -348,16 +357,15 @@
  
  # Soft deletion
  gem 'paranoia', '~> 2.2'
-@@ -366,10 +279,11 @@
- gem 'health_check', '~> 2.6.0'
- 
- # System information
-+gem 'rinku'
- gem 'vmstat', '~> 2.3.0'
- gem 'sys-filesystem', '~> 1.1.6'
- 
+@@ -387,8 +302,10 @@ gem 'sys-filesystem', '~> 1.1.6'
  # Gitaly GRPC client
- gem 'gitaly', '~> 0.6.0'
+ gem 'gitaly', '~> 0.8.0'
  
 -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'
++
++gem 'rinku'

Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab/files/patch-config_gitlab.yml.example	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example	Wed Sep 13 14:15:08 2017	(r449793)
@@ -1,17 +1,17 @@
---- config/gitlab.yml.example.orig	2017-06-07 20:48:31 UTC
+--- config/gitlab.yml.example.orig	2017-08-09 13:53:30 UTC
 +++ config/gitlab.yml.example
-@@ -463,8 +463,8 @@ production: &base
+@@ -467,8 +467,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
 -        path: /home/git/repositories/
 -        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
 +        path: /usr/home/git/repositories/
-+        gitaly_address: unix:/usr/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
++        gitaly_address: unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
  
    ## Backup settings
    backup:
-@@ -491,12 +491,12 @@ production: &base
+@@ -495,12 +495,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -27,7 +27,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -509,7 +509,7 @@ production: &base
+@@ -521,7 +521,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:

Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb
==============================================================================
--- head/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Sep 13 14:15:08 2017	(r449793)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2017-06-07 20:48:31 UTC
+--- config/initializers/1_settings.rb.orig	2017-08-09 13:53:30 UTC
 +++ config/initializers/1_settings.rb
-@@ -215,12 +215,8 @@ Settings.gitlab['email_subject_suffix'] 
+@@ -216,12 +216,8 @@ Settings.gitlab['email_subject_suffix'] 
  Settings.gitlab['base_url']   ||= Settings.__send__(:build_base_gitlab_url)
  Settings.gitlab['url']        ||= Settings.__send__(:build_gitlab_url)
  Settings.gitlab['user']       ||= 'git'

Modified: head/www/gitlab/pkg-message
==============================================================================
--- head/www/gitlab/pkg-message	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/pkg-message	Wed Sep 13 14:15:08 2017	(r449793)
@@ -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.1-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/9.3-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.1.x to 9.2.x, please follow the instructions in the guide at:
+switched from 9.2.x to 9.3.x, please follow the instructions in the guide at:
 
-http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.1-to-9.2-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.2-to-9.3-freebsd.md

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Wed Sep 13 14:13:59 2017	(r449792)
+++ head/www/gitlab/pkg-plist	Wed Sep 13 14:15:08 2017	(r449793)
@@ -1,4 +1,5 @@
 %%WWWDIR%%/.babelrc
+%%WWWDIR%%/.codeclimate.yml
 %%WWWDIR%%/.csscomb.json
 %%WWWDIR%%/.eslintignore
 %%WWWDIR%%/.eslintrc
@@ -1861,6 +1862,7 @@
 %%WWWDIR%%/app/assets/images/gitlab_logo.png
 %%WWWDIR%%/app/assets/images/gitorious-logo-black.png
 %%WWWDIR%%/app/assets/images/gitorious-logo-blue.png
+%%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/koding-logo.svg
@@ -1916,7 +1918,6 @@
 %%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js
 %%WWWDIR%%/app/assets/javascripts/blob/blob_fork_suggestion.js
 %%WWWDIR%%/app/assets/javascripts/blob/blob_line_permalink_updater.js
-%%WWWDIR%%/app/assets/javascripts/blob/create_branch_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/blob/file_template_mediator.js
 %%WWWDIR%%/app/assets/javascripts/blob/file_template_selector.js
 %%WWWDIR%%/app/assets/javascripts/blob/notebook/index.js
@@ -1926,7 +1927,6 @@
 %%WWWDIR%%/app/assets/javascripts/blob/sketch/index.js
 %%WWWDIR%%/app/assets/javascripts/blob/sketch_viewer.js
 %%WWWDIR%%/app/assets/javascripts/blob/stl_viewer.js
-%%WWWDIR%%/app/assets/javascripts/blob/target_branch_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/blob/template_selector.js
 %%WWWDIR%%/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js
 %%WWWDIR%%/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js
@@ -1969,6 +1969,7 @@
 %%WWWDIR%%/app/assets/javascripts/boards/stores/boards_store.js
 %%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/breakpoints.js
 %%WWWDIR%%/app/assets/javascripts/broadcast_message.js
 %%WWWDIR%%/app/assets/javascripts/build.js
@@ -2062,6 +2063,7 @@
 %%WWWDIR%%/app/assets/javascripts/environments/event_hub.js
 %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_bundle.js
 %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_view.vue
+%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_mixin.js
 %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js
 %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js
 %%WWWDIR%%/app/assets/javascripts/extensions/array.js
@@ -2099,22 +2101,46 @@
 %%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
+%%WWWDIR%%/app/assets/javascripts/groups/event_hub.js
+%%WWWDIR%%/app/assets/javascripts/groups/groups_filterable_list.js
+%%WWWDIR%%/app/assets/javascripts/groups/index.js
+%%WWWDIR%%/app/assets/javascripts/groups/services/groups_service.js
+%%WWWDIR%%/app/assets/javascripts/groups/stores/groups_store.js
 %%WWWDIR%%/app/assets/javascripts/groups_list.js
 %%WWWDIR%%/app/assets/javascripts/groups_select.js
 %%WWWDIR%%/app/assets/javascripts/header.js
 %%WWWDIR%%/app/assets/javascripts/importer_status.js
-%%WWWDIR%%/app/assets/javascripts/issuable.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
+%%WWWDIR%%/app/assets/javascripts/issuable_bulk_update_actions.js
+%%WWWDIR%%/app/assets/javascripts/issuable_bulk_update_sidebar.js
 %%WWWDIR%%/app/assets/javascripts/issuable_context.js
 %%WWWDIR%%/app/assets/javascripts/issuable_form.js
+%%WWWDIR%%/app/assets/javascripts/issuable_index.js
 %%WWWDIR%%/app/assets/javascripts/issue.js
-%%WWWDIR%%/app/assets/javascripts/issue_show/actions/tasks.js
+%%WWWDIR%%/app/assets/javascripts/issue_show/components/app.vue
+%%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
+%%WWWDIR%%/app/assets/javascripts/issue_show/components/title.vue
+%%WWWDIR%%/app/assets/javascripts/issue_show/event_hub.js
 %%WWWDIR%%/app/assets/javascripts/issue_show/index.js
-%%WWWDIR%%/app/assets/javascripts/issue_show/issue_title_description.vue
+%%WWWDIR%%/app/assets/javascripts/issue_show/mixins/animate.js
+%%WWWDIR%%/app/assets/javascripts/issue_show/mixins/update.js
 %%WWWDIR%%/app/assets/javascripts/issue_show/services/index.js
+%%WWWDIR%%/app/assets/javascripts/issue_show/stores/index.js
 %%WWWDIR%%/app/assets/javascripts/issue_status_select.js
-%%WWWDIR%%/app/assets/javascripts/issues_bulk_assignment.js
 %%WWWDIR%%/app/assets/javascripts/label_manager.js
 %%WWWDIR%%/app/assets/javascripts/labels.js
 %%WWWDIR%%/app/assets/javascripts/labels_select.js
@@ -2126,11 +2152,12 @@
 %%WWWDIR%%/app/assets/javascripts/lib/utils/ajax_cache.js
 %%WWWDIR%%/app/assets/javascripts/lib/utils/animate.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/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/normalize_newlines.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
@@ -2140,11 +2167,17 @@
 %%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
-%%WWWDIR%%/app/assets/javascripts/locale/de/app.js
-%%WWWDIR%%/app/assets/javascripts/locale/en/app.js
-%%WWWDIR%%/app/assets/javascripts/locale/es/app.js
-%%WWWDIR%%/app/assets/javascripts/locale/index.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/bg/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/de/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/en/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/es/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/index.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/pt_BR/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/zh_CN/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/zh_HK/app.js
+@(git,,) %%WWWDIR%%/app/assets/javascripts/locale/zh_TW/app.js
 %%WWWDIR%%/app/assets/javascripts/logo.js
 %%WWWDIR%%/app/assets/javascripts/main.js
 %%WWWDIR%%/app/assets/javascripts/member_expiration_date.js
@@ -2159,7 +2192,6 @@
 %%WWWDIR%%/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js
 %%WWWDIR%%/app/assets/javascripts/merge_request.js
 %%WWWDIR%%/app/assets/javascripts/merge_request_tabs.js
-%%WWWDIR%%/app/assets/javascripts/merge_request_widget.js
 %%WWWDIR%%/app/assets/javascripts/milestone.js
 %%WWWDIR%%/app/assets/javascripts/milestone_select.js
 %%WWWDIR%%/app/assets/javascripts/mini_pipeline_graph_dropdown.js
@@ -2191,6 +2223,7 @@
 %%WWWDIR%%/app/assets/javascripts/pdf/assets/img/bg.gif
 %%WWWDIR%%/app/assets/javascripts/pdf/index.vue
 %%WWWDIR%%/app/assets/javascripts/pdf/page/index.vue
+%%WWWDIR%%/app/assets/javascripts/peek.js
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/interval_pattern_input.js
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules_callout.js
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/components/target_branch_dropdown.js
@@ -2209,16 +2242,18 @@
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/graph/job_component.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/graph/job_name_component.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+%%WWWDIR%%/app/assets/javascripts/pipelines/components/header_component.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/nav_controls.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/navigation_tabs.js
-%%WWWDIR%%/app/assets/javascripts/pipelines/components/pipeline_url.js
+%%WWWDIR%%/app/assets/javascripts/pipelines/components/pipeline_url.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/pipelines_actions.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/pipelines_artifacts.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/stage.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/time_ago.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/event_hub.js
-%%WWWDIR%%/app/assets/javascripts/pipelines/graph_bundle.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/index.js
+%%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+%%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_mediatior.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/pipelines.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipeline_service.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipelines_service.js
@@ -2230,6 +2265,7 @@
 %%WWWDIR%%/app/assets/javascripts/profile/profile_bundle.js
 %%WWWDIR%%/app/assets/javascripts/project.js
 %%WWWDIR%%/app/assets/javascripts/project_avatar.js
+%%WWWDIR%%/app/assets/javascripts/project_edit.js
 %%WWWDIR%%/app/assets/javascripts/project_find_file.js
 %%WWWDIR%%/app/assets/javascripts/project_fork.js
 %%WWWDIR%%/app/assets/javascripts/project_import.js
@@ -2259,6 +2295,7 @@
 %%WWWDIR%%/app/assets/javascripts/right_sidebar.js
 %%WWWDIR%%/app/assets/javascripts/search.js
 %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js
+%%WWWDIR%%/app/assets/javascripts/settings_panels.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts_blob.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js
@@ -2357,11 +2394,21 @@
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_badge_link.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_icon.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/commit.js
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/header_ci_component.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_icon.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/memory_graph.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pipelines_table.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pipelines_table_row.js
-%%WWWDIR%%/app/assets/javascripts/vue_shared/components/table_pagination.js
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/table_pagination.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_svg.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/timeago.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/tooltip.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/translate.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/vue_resource_interceptor.js
@@ -2405,9 +2452,11 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/mobile.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/modal.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/nav.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/notes.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/page-header.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/pagination.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/panels.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/responsive-tables.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/sidebar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/snippets.scss
@@ -2433,6 +2482,7 @@
 %%WWWDIR%%/app/assets/stylesheets/pages/ci_projects.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/commits.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/container_registry.scss
+%%WWWDIR%%/app/assets/stylesheets/pages/convdev_index.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/cycle_analytics.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/deploy_keys.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/detail_page.scss
@@ -2483,16 +2533,18 @@
 %%WWWDIR%%/app/controllers/admin/applications_controller.rb
 %%WWWDIR%%/app/controllers/admin/background_jobs_controller.rb
 %%WWWDIR%%/app/controllers/admin/broadcast_messages_controller.rb
-%%WWWDIR%%/app/controllers/admin/builds_controller.rb
 %%WWWDIR%%/app/controllers/admin/cohorts_controller.rb
+%%WWWDIR%%/app/controllers/admin/conversational_development_index_controller.rb
 %%WWWDIR%%/app/controllers/admin/dashboard_controller.rb
 %%WWWDIR%%/app/controllers/admin/deploy_keys_controller.rb
 %%WWWDIR%%/app/controllers/admin/groups_controller.rb
 %%WWWDIR%%/app/controllers/admin/health_check_controller.rb
+%%WWWDIR%%/app/controllers/admin/hook_logs_controller.rb
 %%WWWDIR%%/app/controllers/admin/hooks_controller.rb
 %%WWWDIR%%/app/controllers/admin/identities_controller.rb
 %%WWWDIR%%/app/controllers/admin/impersonation_tokens_controller.rb
 %%WWWDIR%%/app/controllers/admin/impersonations_controller.rb
+%%WWWDIR%%/app/controllers/admin/jobs_controller.rb
 %%WWWDIR%%/app/controllers/admin/keys_controller.rb
 %%WWWDIR%%/app/controllers/admin/labels_controller.rb
 %%WWWDIR%%/app/controllers/admin/logs_controller.rb
@@ -2513,6 +2565,7 @@
 %%WWWDIR%%/app/controllers/concerns/cycle_analytics_params.rb
 %%WWWDIR%%/app/controllers/concerns/diff_for_path.rb
 %%WWWDIR%%/app/controllers/concerns/enforces_two_factor_authentication.rb
+%%WWWDIR%%/app/controllers/concerns/hooks_execution.rb
 %%WWWDIR%%/app/controllers/concerns/issuable_actions.rb
 %%WWWDIR%%/app/controllers/concerns/issuable_collections.rb
 %%WWWDIR%%/app/controllers/concerns/issues_action.rb
@@ -2568,6 +2621,7 @@
 %%WWWDIR%%/app/controllers/invites_controller.rb
 %%WWWDIR%%/app/controllers/jwt_controller.rb
 %%WWWDIR%%/app/controllers/koding_controller.rb
+%%WWWDIR%%/app/controllers/metrics_controller.rb
 %%WWWDIR%%/app/controllers/notification_settings_controller.rb
 %%WWWDIR%%/app/controllers/oauth/applications_controller.rb
 %%WWWDIR%%/app/controllers/oauth/authorizations_controller.rb
@@ -2599,6 +2653,7 @@
 %%WWWDIR%%/app/controllers/projects/boards/lists_controller.rb
 %%WWWDIR%%/app/controllers/projects/boards_controller.rb
 %%WWWDIR%%/app/controllers/projects/branches_controller.rb
+%%WWWDIR%%/app/controllers/projects/build_artifacts_controller.rb
 %%WWWDIR%%/app/controllers/projects/builds_controller.rb
 %%WWWDIR%%/app/controllers/projects/commit_controller.rb
 %%WWWDIR%%/app/controllers/projects/commits_controller.rb
@@ -2615,9 +2670,11 @@
 %%WWWDIR%%/app/controllers/projects/git_http_controller.rb
 %%WWWDIR%%/app/controllers/projects/graphs_controller.rb
 %%WWWDIR%%/app/controllers/projects/group_links_controller.rb
+%%WWWDIR%%/app/controllers/projects/hook_logs_controller.rb
 %%WWWDIR%%/app/controllers/projects/hooks_controller.rb
 %%WWWDIR%%/app/controllers/projects/imports_controller.rb
 %%WWWDIR%%/app/controllers/projects/issues_controller.rb
+%%WWWDIR%%/app/controllers/projects/jobs_controller.rb
 %%WWWDIR%%/app/controllers/projects/labels_controller.rb
 %%WWWDIR%%/app/controllers/projects/lfs_api_controller.rb
 %%WWWDIR%%/app/controllers/projects/lfs_storage_controller.rb
@@ -2678,6 +2735,7 @@
 %%WWWDIR%%/app/finders/branches_finder.rb
 %%WWWDIR%%/app/finders/contributed_projects_finder.rb
 %%WWWDIR%%/app/finders/environments_finder.rb
+%%WWWDIR%%/app/finders/events_finder.rb
 %%WWWDIR%%/app/finders/group_finder.rb
 %%WWWDIR%%/app/finders/group_members_finder.rb
 %%WWWDIR%%/app/finders/group_projects_finder.rb
@@ -2700,6 +2758,7 @@
 %%WWWDIR%%/app/finders/tags_finder.rb
 %%WWWDIR%%/app/finders/todos_finder.rb
 %%WWWDIR%%/app/finders/union_finder.rb
+%%WWWDIR%%/app/finders/users_finder.rb
 %%WWWDIR%%/app/helpers/accounts_helper.rb
 %%WWWDIR%%/app/helpers/appearances_helper.rb
 %%WWWDIR%%/app/helpers/application_helper.rb
@@ -2717,6 +2776,7 @@
 %%WWWDIR%%/app/helpers/commits_helper.rb
 %%WWWDIR%%/app/helpers/compare_helper.rb
 %%WWWDIR%%/app/helpers/components_helper.rb
+%%WWWDIR%%/app/helpers/conversational_development_index_helper.rb
 %%WWWDIR%%/app/helpers/dashboard_helper.rb
 %%WWWDIR%%/app/helpers/diff_helper.rb
 %%WWWDIR%%/app/helpers/dropdowns_helper.rb
@@ -2751,6 +2811,7 @@
 %%WWWDIR%%/app/helpers/page_layout_helper.rb
 %%WWWDIR%%/app/helpers/pipeline_schedules_helper.rb
 %%WWWDIR%%/app/helpers/preferences_helper.rb
+%%WWWDIR%%/app/helpers/profiles_helper.rb
 %%WWWDIR%%/app/helpers/projects_helper.rb
 %%WWWDIR%%/app/helpers/rss_helper.rb
 %%WWWDIR%%/app/helpers/runners_helper.rb
@@ -2797,24 +2858,44 @@
 %%WWWDIR%%/app/models/audit_event.rb
 %%WWWDIR%%/app/models/award_emoji.rb
 %%WWWDIR%%/app/models/blob.rb
+%%WWWDIR%%/app/models/blob_viewer/auxiliary.rb
 %%WWWDIR%%/app/models/blob_viewer/balsamiq.rb
 %%WWWDIR%%/app/models/blob_viewer/base.rb
 %%WWWDIR%%/app/models/blob_viewer/binary_stl.rb
+%%WWWDIR%%/app/models/blob_viewer/cartfile.rb
+%%WWWDIR%%/app/models/blob_viewer/changelog.rb
 %%WWWDIR%%/app/models/blob_viewer/client_side.rb
+%%WWWDIR%%/app/models/blob_viewer/composer_json.rb
+%%WWWDIR%%/app/models/blob_viewer/contributing.rb
+%%WWWDIR%%/app/models/blob_viewer/dependency_manager.rb
 %%WWWDIR%%/app/models/blob_viewer/download.rb
 %%WWWDIR%%/app/models/blob_viewer/empty.rb
+%%WWWDIR%%/app/models/blob_viewer/gemfile.rb
+%%WWWDIR%%/app/models/blob_viewer/gemspec.rb
+%%WWWDIR%%/app/models/blob_viewer/gitlab_ci_yml.rb
+%%WWWDIR%%/app/models/blob_viewer/godeps_json.rb
 %%WWWDIR%%/app/models/blob_viewer/image.rb
+%%WWWDIR%%/app/models/blob_viewer/license.rb
 %%WWWDIR%%/app/models/blob_viewer/markup.rb
 %%WWWDIR%%/app/models/blob_viewer/notebook.rb
+%%WWWDIR%%/app/models/blob_viewer/package_json.rb

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