Merge branch 'master' into gnome-3.24gnome-3.24

author: Koop Mast <kwm@rainbow-runner.nl> 2017-09-15 15:12:44 +0800
committer: Koop Mast <kwm@rainbow-runner.nl> 2017-09-15 15:12:44 +0800
commit: ab1f40794d9dbcc1388a9257d285362f52f74596 (patch)
tree: 2a6a7e2dc039c429914eaca76a443556bf403df2 /www
parent: fd6770ac21bfbaf4055314e3e44262e074d8043b (diff)
parent: 26f34f6d62441f81a8d0d43f1908a496c283ee05 (diff)
download: freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.tar.gz
freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.tar.zst
freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.zip
153 files changed, 1818 insertions, 909 deletions
diff --git a/www/Makefile b/www/Makefile
index 7d24b6e3418f..4ec69397ae46 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -424,6 +424,7 @@
     SUBDIR += mod_auth_mysql2
     SUBDIR += mod_auth_mysql_another
     SUBDIR += mod_auth_openid
+    SUBDIR += mod_auth_openidc
     SUBDIR += mod_auth_pam2
     SUBDIR += mod_auth_pgsql2
     SUBDIR += mod_auth_pubtkt
@@ -544,6 +545,7 @@
     SUBDIR += node6
     SUBDIR += nostromo
     SUBDIR += novnc
+    SUBDIR += novnc-websockify
     SUBDIR += npapi-vlc
     SUBDIR += npapi-xine
     SUBDIR += npc
@@ -1081,6 +1083,7 @@
     SUBDIR += p5-MediaWiki-API
     SUBDIR += p5-Mobile-UserAgent
     SUBDIR += p5-ModPerl-VersionUtil
+    SUBDIR += p5-Mojo-IOLoop-ForkCall
     SUBDIR += p5-Mojo-Server-FastCGI
     SUBDIR += p5-MojoMojo
     SUBDIR += p5-MojoX-Log-Dispatch-Simple
@@ -1700,6 +1703,7 @@
     SUBDIR += py-pastedeploy
     SUBDIR += py-pastescript
     SUBDIR += py-pelican
+    SUBDIR += py-planet
     SUBDIR += py-plone.alterego
     SUBDIR += py-plone.app.blob
     SUBDIR += py-plone.app.caching
diff --git a/www/anyterm/Makefile b/www/anyterm/Makefile
index 49bfd143bb31..dae087d047c5 100644
--- a/www/anyterm/Makefile
+++ b/www/anyterm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anyterm
 PORTVERSION=	1.1.29
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://anyterm.org/download/ \
 		http://dl1.douglasthrift.net/${PORTNAME}/ \
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 816c449de33a..a8d537cf5a20 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aria2
 PORTVERSION=	1.32.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/www/bozohttpd/pkg-descr b/www/bozohttpd/pkg-descr
index a3ed41e1cb0e..44bd50359ca6 100644
--- a/www/bozohttpd/pkg-descr
+++ b/www/bozohttpd/pkg-descr
@@ -1,4 +1,4 @@
-Bozohttpd is a small and secure http version 1.1 server. it's main feature
+Bozohttpd is a small and secure HTTP version 1.1 server. Its main feature
 is the lack of features, reducing the code size and improving verifiability.
 
 It supports CGI/1.1, HTTP/1.1, HTTP/1.0, HTTP/0.9, ~user translations,
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 27524c504216..0c4792da00ea 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	60.0.3112.113
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile
index 219b92905fd7..15aabc8a0abf 100644
--- a/www/cl-lml-sbcl/Makefile
+++ b/www/cl-lml-sbcl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lml
 PORTVERSION=	2.5.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	www textproc
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index a469470cd894..bcbe6a7168d7 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cppcms
 PORTVERSION=	1.0.5
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index f4e704540d84..064d104c52b3 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	edbrowse
 PORTVERSION=	3.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www editors
 MASTER_SITES=	http://the-brannons.com/edbrowse/ \
 		http://rithmomachia.org/edbrowse/
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index e6cab5dc1d65..159714c9d690 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs-w3m
 PORTVERSION=	1.4.598.b.${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www elisp
 MASTER_SITES=	LOCAL/nobutaka
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/www/firefox/files/patch-bug1376277 b/www/firefox/files/patch-bug1376277
new file mode 100644
index 000000000000..77164834a9bd
--- /dev/null
+++ b/www/firefox/files/patch-bug1376277
@@ -0,0 +1,22 @@
+commit ac723ae99f3a
+Author: Petr Sumbera <petr.sumbera@oracle.com>
+Date:   Tue Jun 27 01:33:49 2017 -0700
+
+    Bug 1376277 - nsWrapperCache.h: add support for 64bits sparc build. r=glandium
+---
+ dom/base/nsWrapperCache.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git dom/base/nsWrapperCache.h dom/base/nsWrapperCache.h
+index b00d7aceb5c8..994ed73332ff 100644
+--- dom/base/nsWrapperCache.h
++++ dom/base/nsWrapperCache.h
+@@ -41,7 +41,7 @@ class nsWindowRoot;
+ // This may waste space for some other nsWrapperCache-derived objects that have
+ // a 32-bit field as their first member, but those objects are unlikely to be as
+ // numerous or performance-critical as DOM nodes.
+-#if defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__)
++#if defined(_M_X64) || defined(__LP64__)
+ static_assert(sizeof(void*) == 8, "These architectures should be 64-bit");
+ #define BOOL_FLAGS_ON_WRAPPER_CACHE
+ #else
diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile
index 6fb5642dc17e..2733010148cb 100644
--- a/www/flashplayer/Makefile
+++ b/www/flashplayer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	flashplayer
-PORTVERSION=	26.0
+PORTVERSION=	27.0
 CATEGORIES=	www multimedia
 DISTFILES=
 
diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
index e9b6a7ea6cca..417729ed37e1 100644
--- a/www/gecko-mediaplayer/Makefile
+++ b/www/gecko-mediaplayer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gecko-mediaplayer
 PORTVERSION=	1.0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www multimedia gnome
 MASTER_SITES=	https://pkgs.rpmfusion.org/repo/pkgs/free/gecko-mediaplayer/gecko-mediaplayer-1.0.9.tar.gz/69b50ecbbbf34ca6d980a477345dbd40/
 
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index bfa5737cc4bf..6e9746fda4cd 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitea
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index 2858ba163c6d..2bbec4772017 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502317856
-SHA256 (go-gitea-gitea-v1.1.3_GH0.tar.gz) = 094022c3e1d1fd1514936d06674e3450871bed2a41c629a39c57c1db2d18a2a4
-SIZE (go-gitea-gitea-v1.1.3_GH0.tar.gz) = 13017122
+TIMESTAMP = 1504712157
+SHA256 (go-gitea-gitea-v1.1.4_GH0.tar.gz) = 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7
+SIZE (go-gitea-gitea-v1.1.4_GH0.tar.gz) = 13018104
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 7da00c2cfa8e..4916be7ae2f0 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index dd53a81450c0..ecc35be5b71f 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499074823
-SHA256 (gitlab-workhorse-v2.0.0.tar.gz) = dcea4767b402cf5b99095ba17d5ea69630066d715f01500b684e1ce35abc9803
-SIZE (gitlab-workhorse-v2.0.0.tar.gz) = 761339
+TIMESTAMP = 1502872952
+SHA256 (gitlab-workhorse-v2.1.1.tar.gz) = 495e358ef55faa075d2a5bcf46a99a2f4127639676b9386adf3da31d082584e1
+SIZE (gitlab-workhorse-v2.1.1.tar.gz) = 767494
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 7e638e0e4014..1bb63101aafb 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	9.2.10
+PORTVERSION=	9.3.11
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
@@ -44,7 +43,7 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	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-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
+	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 \
@@ -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 \
@@ -98,8 +98,8 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
 	rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \
 	rubygem-rouge>=2.0:textproc/rubygem-rouge \
-	rubygem-truncato>=0.7.8:textproc/rubygem-truncato \
-	rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri  \
+	rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
+	rubygem-nokogiri>=1.8.0: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 \
@@ -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 \
@@ -148,7 +148,7 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
 	rubygem-addressable>=2.3.8: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:graphics/rubygem-gemojione \
+	rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
 	rubygem-gon>=6.1.0:www/rubygem-gon \
 	rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \
 	rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \
@@ -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:
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index ee58d3bdc1f1..00ba82e77ad9 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -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 = 1505384599
+SHA256 (gitlabhq-gitlabhq-v9.3.11_GH0.tar.gz) = 3a3f0ec77f209e8f3296d55e960388b08cb69c762668c40aea92f6f6511e0677
+SIZE (gitlabhq-gitlabhq-v9.3.11_GH0.tar.gz) = 31763943
diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index dfb1e442df98..243cd60d5324 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -60,7 +60,16 @@ gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
 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
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index d9b969eae746..d333686137d7 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,10 +1,10 @@
---- Gemfile.orig	2017-07-20 19:20:16.056471000 +0200
-+++ Gemfile	2017-07-20 19:28:14.691625000 +0200
+--- Gemfile.orig	2017-09-06 21:34:31 UTC
++++ Gemfile
 @@ -1,48 +1,43 @@
  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
@@ -33,7 +33,7 @@
 +gem 'omniauth', '>= 1.4.2'
  gem 'omniauth-auth0', '~> 1.4.1'
  gem 'omniauth-azure-oauth2', '~> 0.0.6'
- gem 'omniauth-cas3', '~> 1.1.2'
+ gem 'omniauth-cas3', '~> 1.1.4'
  gem 'omniauth-facebook', '~> 4.0.0'
  gem 'omniauth-github', '~> 1.1.1'
  gem 'omniauth-gitlab', '~> 1.0.2'
@@ -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,31 +105,31 @@ 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,13 @@
  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 'truncato', '~> 0.7.9'
+ gem 'nokogiri', '~> 1.8.0'
  
  # Diffs
 -gem 'diffy', '~> 3.1.0'
@@ -135,18 +135,8 @@
  # Run events after state machine commits
  gem 'after_commit_queue', '~> 1.3.0'
  
-@@ -145,18 +140,18 @@
- 
- # 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'
+@@ -151,10 +146,10 @@ gem 'sidekiq-limit_fetch', '~> 3.4'
+ gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
 -gem 'httparty', '~> 0.13.3'
@@ -158,7 +148,7 @@
  
  # GitLab settings
  gem 'settingslogic', '~> 2.0.9'
-@@ -166,7 +161,7 @@
+@@ -164,7 +159,7 @@ gem 're2', '~> 1.0.0'
  
  # Misc
  
@@ -167,7 +157,7 @@
  
  # Cache
  gem 'redis-rails', '~> 5.0.1'
-@@ -176,10 +171,10 @@
+@@ -174,10 +169,10 @@ gem 'redis', '~> 3.2'
  gem 'connection_pool', '~> 2.0'
  
  # HipChat integration
@@ -180,7 +170,7 @@
  
  # Flowdock integration
  gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -197,7 +192,7 @@
+@@ -195,7 +190,7 @@ gem 'asana', '~> 0.6.0'
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -189,7 +179,7 @@
  
  # d3
  gem 'd3_rails', '~> 3.5.0'
-@@ -206,7 +201,7 @@
+@@ -204,7 +199,7 @@ gem 'd3_rails', '~> 3.5.0'
  gem 'underscore-rails', '~> 1.8.0'
  
  # Sanitize user input
@@ -198,7 +188,7 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -216,7 +211,7 @@
+@@ -214,7 +209,7 @@ gem 'loofah', '~> 2.0.3'
  gem 'licensee', '~> 8.7.0'
  
  # Protect against bruteforcing
@@ -207,7 +197,7 @@
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.1.0'
-@@ -235,129 +230,47 @@
+@@ -233,143 +228,62 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.10'
@@ -223,7 +213,7 @@
 +gem 'addressable', '>= 2.3.8'
  gem 'bootstrap-sass', '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.7'
- gem 'gemojione', '~> 3.0'
+ gem 'gemojione', '~> 3.3'
  gem 'gon', '~> 6.1.0'
  gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails', '~> 4.1.0'
@@ -240,7 +230,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 +239,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
@@ -348,16 +353,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'
- 
+@@ -384,8 +298,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'
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index e33ebf81205b..fa6e16f2c6b0 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -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:
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
index 8a92be748d72..b46fff2fabf5 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -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'
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 0926153f6d62..d86ca884a581 100644
--- a/www/gitlab/pkg-message
+++ b/www/gitlab/pkg-message
@@ -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
diff --git a/www/gitlab/pkg-plist b/www/gitlab/pkg-plist
index 1bd29d0cfd89..dd71c9f0336c 100644
--- a/www/gitlab/pkg-plist
+++ b/www/gitlab/pkg-plist
@@ -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
 %%WWWDIR%%/app/models/blob_viewer/pdf.rb
+%%WWWDIR%%/app/models/blob_viewer/podfile.rb
+%%WWWDIR%%/app/models/blob_viewer/podspec.rb
+%%WWWDIR%%/app/models/blob_viewer/podspec_json.rb
+%%WWWDIR%%/app/models/blob_viewer/readme.rb
+%%WWWDIR%%/app/models/blob_viewer/requirements_txt.rb
 %%WWWDIR%%/app/models/blob_viewer/rich.rb
+%%WWWDIR%%/app/models/blob_viewer/route_map.rb
 %%WWWDIR%%/app/models/blob_viewer/server_side.rb
 %%WWWDIR%%/app/models/blob_viewer/simple.rb
 %%WWWDIR%%/app/models/blob_viewer/sketch.rb
+%%WWWDIR%%/app/models/blob_viewer/static.rb
 %%WWWDIR%%/app/models/blob_viewer/svg.rb
 %%WWWDIR%%/app/models/blob_viewer/text.rb
 %%WWWDIR%%/app/models/blob_viewer/text_stl.rb
 %%WWWDIR%%/app/models/blob_viewer/video.rb
+%%WWWDIR%%/app/models/blob_viewer/yarn_lock.rb
 %%WWWDIR%%/app/models/board.rb
 %%WWWDIR%%/app/models/broadcast_message.rb
 %%WWWDIR%%/app/models/chat_name.rb
@@ -2822,6 +2903,7 @@
 %%WWWDIR%%/app/models/ci/artifact_blob.rb
 %%WWWDIR%%/app/models/ci/build.rb
 %%WWWDIR%%/app/models/ci/group.rb
+%%WWWDIR%%/app/models/ci/legacy_stage.rb
 %%WWWDIR%%/app/models/ci/pipeline.rb
 %%WWWDIR%%/app/models/ci/pipeline_schedule.rb
 %%WWWDIR%%/app/models/ci/runner.rb
@@ -2835,6 +2917,7 @@
 %%WWWDIR%%/app/models/commit_status.rb
 %%WWWDIR%%/app/models/compare.rb
 %%WWWDIR%%/app/models/concerns/access_requestable.rb
+%%WWWDIR%%/app/models/concerns/avatarable.rb
 %%WWWDIR%%/app/models/concerns/awardable.rb
 %%WWWDIR%%/app/models/concerns/blob_like.rb
 %%WWWDIR%%/app/models/concerns/cache_markdown_field.rb
@@ -2850,6 +2933,7 @@
 %%WWWDIR%%/app/models/concerns/internal_id.rb
 %%WWWDIR%%/app/models/concerns/issuable.rb
 %%WWWDIR%%/app/models/concerns/mentionable.rb
+%%WWWDIR%%/app/models/concerns/mentionable/reference_regexes.rb
 %%WWWDIR%%/app/models/concerns/milestoneish.rb
 %%WWWDIR%%/app/models/concerns/note_on_diff.rb
 %%WWWDIR%%/app/models/concerns/noteable.rb
@@ -2879,6 +2963,9 @@
 %%WWWDIR%%/app/models/concerns/uniquify.rb
 %%WWWDIR%%/app/models/concerns/valid_attribute.rb
 %%WWWDIR%%/app/models/container_repository.rb
+%%WWWDIR%%/app/models/conversational_development_index/card.rb
+%%WWWDIR%%/app/models/conversational_development_index/idea_to_production_step.rb
+%%WWWDIR%%/app/models/conversational_development_index/metric.rb
 %%WWWDIR%%/app/models/cycle_analytics.rb
 %%WWWDIR%%/app/models/cycle_analytics/summary.rb
 %%WWWDIR%%/app/models/dashboard_milestone.rb
@@ -2906,6 +2993,7 @@
 %%WWWDIR%%/app/models/hooks/service_hook.rb
 %%WWWDIR%%/app/models/hooks/system_hook.rb
 %%WWWDIR%%/app/models/hooks/web_hook.rb
+%%WWWDIR%%/app/models/hooks/web_hook_log.rb
 %%WWWDIR%%/app/models/identity.rb
 %%WWWDIR%%/app/models/individual_note_discussion.rb
 %%WWWDIR%%/app/models/issue.rb
@@ -3002,6 +3090,7 @@
 %%WWWDIR%%/app/models/protected_ref_matcher.rb
 %%WWWDIR%%/app/models/protected_tag.rb
 %%WWWDIR%%/app/models/protected_tag/create_access_level.rb
+%%WWWDIR%%/app/models/readme_blob.rb
 %%WWWDIR%%/app/models/redirect_route.rb
 %%WWWDIR%%/app/models/release.rb
 %%WWWDIR%%/app/models/repository.rb
@@ -3032,6 +3121,7 @@
 %%WWWDIR%%/app/policies/ci/runner_policy.rb
 %%WWWDIR%%/app/policies/ci/trigger_policy.rb
 %%WWWDIR%%/app/policies/commit_status_policy.rb
+%%WWWDIR%%/app/policies/deploy_key_policy.rb
 %%WWWDIR%%/app/policies/deployment_policy.rb
 %%WWWDIR%%/app/policies/environment_policy.rb
 %%WWWDIR%%/app/policies/external_issue_policy.rb
@@ -3053,6 +3143,7 @@
 %%WWWDIR%%/app/presenters/README.md
 %%WWWDIR%%/app/presenters/ci/build_presenter.rb
 %%WWWDIR%%/app/presenters/ci/pipeline_presenter.rb
+%%WWWDIR%%/app/presenters/conversational_development_index/metric_presenter.rb
 %%WWWDIR%%/app/presenters/merge_request_presenter.rb
 %%WWWDIR%%/app/presenters/projects/settings/deploy_keys_presenter.rb
 %%WWWDIR%%/app/serializers/README.md
@@ -3072,7 +3163,7 @@
 %%WWWDIR%%/app/serializers/base_serializer.rb
 %%WWWDIR%%/app/serializers/build_action_entity.rb
 %%WWWDIR%%/app/serializers/build_artifact_entity.rb
-%%WWWDIR%%/app/serializers/build_entity.rb
+%%WWWDIR%%/app/serializers/build_details_entity.rb
 %%WWWDIR%%/app/serializers/build_serializer.rb
 %%WWWDIR%%/app/serializers/cohort_activity_month_entity.rb
 %%WWWDIR%%/app/serializers/cohort_entity.rb
@@ -3088,9 +3179,12 @@
 %%WWWDIR%%/app/serializers/environment_entity.rb
 %%WWWDIR%%/app/serializers/environment_serializer.rb
 %%WWWDIR%%/app/serializers/event_entity.rb
+%%WWWDIR%%/app/serializers/group_entity.rb
+%%WWWDIR%%/app/serializers/group_serializer.rb
 %%WWWDIR%%/app/serializers/issuable_entity.rb
 %%WWWDIR%%/app/serializers/issue_entity.rb
 %%WWWDIR%%/app/serializers/issue_serializer.rb
+%%WWWDIR%%/app/serializers/job_entity.rb
 %%WWWDIR%%/app/serializers/job_group_entity.rb
 %%WWWDIR%%/app/serializers/label_entity.rb
 %%WWWDIR%%/app/serializers/label_serializer.rb
@@ -3100,10 +3194,12 @@
 %%WWWDIR%%/app/serializers/merge_request_create_serializer.rb
 %%WWWDIR%%/app/serializers/merge_request_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_serializer.rb
+%%WWWDIR%%/app/serializers/pipeline_details_entity.rb
 %%WWWDIR%%/app/serializers/pipeline_entity.rb
 %%WWWDIR%%/app/serializers/pipeline_serializer.rb
 %%WWWDIR%%/app/serializers/project_entity.rb
 %%WWWDIR%%/app/serializers/request_aware_entity.rb
+%%WWWDIR%%/app/serializers/runner_entity.rb
 %%WWWDIR%%/app/serializers/stage_entity.rb
 %%WWWDIR%%/app/serializers/status_entity.rb
 %%WWWDIR%%/app/serializers/user_entity.rb
@@ -3127,9 +3223,9 @@
 %%WWWDIR%%/app/services/boards/lists/move_service.rb
 %%WWWDIR%%/app/services/chat_names/authorize_user_service.rb
 %%WWWDIR%%/app/services/chat_names/find_user_service.rb
-%%WWWDIR%%/app/services/ci/create_pipeline_builds_service.rb
 %%WWWDIR%%/app/services/ci/create_pipeline_schedule_service.rb
 %%WWWDIR%%/app/services/ci/create_pipeline_service.rb
+%%WWWDIR%%/app/services/ci/create_pipeline_stages_service.rb
 %%WWWDIR%%/app/services/ci/create_trigger_request_service.rb
 %%WWWDIR%%/app/services/ci/play_build_service.rb
 %%WWWDIR%%/app/services/ci/process_pipeline_service.rb
@@ -3154,6 +3250,7 @@
 %%WWWDIR%%/app/services/delete_merged_branches_service.rb
 %%WWWDIR%%/app/services/discussions/base_service.rb
 %%WWWDIR%%/app/services/discussions/resolve_service.rb
+%%WWWDIR%%/app/services/discussions/update_diff_position_service.rb
 %%WWWDIR%%/app/services/event_create_service.rb
 %%WWWDIR%%/app/services/files/base_service.rb
 %%WWWDIR%%/app/services/files/create_dir_service.rb
@@ -3177,10 +3274,6 @@
 %%WWWDIR%%/app/services/issues/base_service.rb
 %%WWWDIR%%/app/services/issues/build_service.rb
 %%WWWDIR%%/app/services/issues/close_service.rb
-%%WWWDIR%%/app/services/merge_requests/conflicts/base_service.rb
-%%WWWDIR%%/app/services/merge_requests/conflicts/list_service.rb
-%%WWWDIR%%/app/services/merge_requests/conflicts/resolve_service.rb
-%%WWWDIR%%/app/services/merge_requests/create_from_issue_service.rb
 %%WWWDIR%%/app/services/issues/create_service.rb
 %%WWWDIR%%/app/services/issues/move_service.rb
 %%WWWDIR%%/app/services/issues/reopen_service.rb
@@ -3202,6 +3295,10 @@
 %%WWWDIR%%/app/services/merge_requests/base_service.rb
 %%WWWDIR%%/app/services/merge_requests/build_service.rb
 %%WWWDIR%%/app/services/merge_requests/close_service.rb
+%%WWWDIR%%/app/services/merge_requests/conflicts/base_service.rb
+%%WWWDIR%%/app/services/merge_requests/conflicts/list_service.rb
+%%WWWDIR%%/app/services/merge_requests/conflicts/resolve_service.rb
+%%WWWDIR%%/app/services/merge_requests/create_from_issue_service.rb
 %%WWWDIR%%/app/services/merge_requests/create_service.rb
 %%WWWDIR%%/app/services/merge_requests/get_urls_service.rb
 %%WWWDIR%%/app/services/merge_requests/merge_request_diff_cache_service.rb
@@ -3212,6 +3309,7 @@
 %%WWWDIR%%/app/services/merge_requests/reopen_service.rb
 %%WWWDIR%%/app/services/merge_requests/resolved_discussion_notification_service.rb
 %%WWWDIR%%/app/services/merge_requests/update_service.rb
+%%WWWDIR%%/app/services/metrics_service.rb
 %%WWWDIR%%/app/services/milestones/base_service.rb
 %%WWWDIR%%/app/services/milestones/close_service.rb
 %%WWWDIR%%/app/services/milestones/create_service.rb
@@ -3222,7 +3320,6 @@
 %%WWWDIR%%/app/services/notes/build_service.rb
 %%WWWDIR%%/app/services/notes/create_service.rb
 %%WWWDIR%%/app/services/notes/destroy_service.rb
-%%WWWDIR%%/app/services/notes/diff_position_update_service.rb
 %%WWWDIR%%/app/services/notes/post_process_service.rb
 %%WWWDIR%%/app/services/notes/slash_commands_service.rb
 %%WWWDIR%%/app/services/notes/update_service.rb
@@ -3262,6 +3359,7 @@
 %%WWWDIR%%/app/services/slash_commands/interpret_service.rb
 %%WWWDIR%%/app/services/spam_check_service.rb
 %%WWWDIR%%/app/services/spam_service.rb
+%%WWWDIR%%/app/services/submit_usage_ping_service.rb
 %%WWWDIR%%/app/services/system_hooks_service.rb
 %%WWWDIR%%/app/services/system_note_service.rb
 %%WWWDIR%%/app/services/tags/create_service.rb
@@ -3280,6 +3378,7 @@
 %%WWWDIR%%/app/services/users/migrate_to_ghost_user_service.rb
 %%WWWDIR%%/app/services/users/refresh_authorized_projects_service.rb
 %%WWWDIR%%/app/services/validate_new_branch_service.rb
+%%WWWDIR%%/app/services/web_hook_service.rb
 %%WWWDIR%%/app/services/wiki_pages/base_service.rb
 %%WWWDIR%%/app/services/wiki_pages/create_service.rb
 %%WWWDIR%%/app/services/wiki_pages/destroy_service.rb
@@ -3287,6 +3386,7 @@
 %%WWWDIR%%/app/uploaders/artifact_uploader.rb
 %%WWWDIR%%/app/uploaders/attachment_uploader.rb
 %%WWWDIR%%/app/uploaders/avatar_uploader.rb
+%%WWWDIR%%/app/uploaders/file_mover.rb
 %%WWWDIR%%/app/uploaders/file_uploader.rb
 %%WWWDIR%%/app/uploaders/gitlab_uploader.rb
 %%WWWDIR%%/app/uploaders/lfs_object_uploader.rb
@@ -3314,8 +3414,6 @@
 %%WWWDIR%%/app/views/admin/appearances/_form.html.haml
 %%WWWDIR%%/app/views/admin/appearances/preview.html.haml
 %%WWWDIR%%/app/views/admin/appearances/show.html.haml
-%%WWWDIR%%/app/views/admin/hooks/_form.html.haml
-%%WWWDIR%%/app/views/admin/hooks/edit.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/_form.html.haml
 %%WWWDIR%%/app/views/admin/application_settings/show.html.haml
 %%WWWDIR%%/app/views/admin/applications/_delete_form.html.haml
@@ -3324,18 +3422,22 @@
 %%WWWDIR%%/app/views/admin/applications/index.html.haml
 %%WWWDIR%%/app/views/admin/applications/new.html.haml
 %%WWWDIR%%/app/views/admin/applications/show.html.haml
-%%WWWDIR%%/app/views/admin/background_jobs/_head.html.haml
 %%WWWDIR%%/app/views/admin/background_jobs/show.html.haml
 %%WWWDIR%%/app/views/admin/broadcast_messages/_form.html.haml
 %%WWWDIR%%/app/views/admin/broadcast_messages/edit.html.haml
 %%WWWDIR%%/app/views/admin/broadcast_messages/index.html.haml
 %%WWWDIR%%/app/views/admin/broadcast_messages/preview.js.haml
-%%WWWDIR%%/app/views/admin/builds/index.html.haml
 %%WWWDIR%%/app/views/admin/cohorts/_cohorts_table.html.haml
 %%WWWDIR%%/app/views/admin/cohorts/_usage_ping.html.haml
 %%WWWDIR%%/app/views/admin/cohorts/index.html.haml
+%%WWWDIR%%/app/views/admin/conversational_development_index/_callout.html.haml
+%%WWWDIR%%/app/views/admin/conversational_development_index/_card.html.haml
+%%WWWDIR%%/app/views/admin/conversational_development_index/_disabled.html.haml
+%%WWWDIR%%/app/views/admin/conversational_development_index/_no_data.html.haml
+%%WWWDIR%%/app/views/admin/conversational_development_index/show.html.haml
 %%WWWDIR%%/app/views/admin/dashboard/_head.html.haml
 %%WWWDIR%%/app/views/admin/dashboard/index.html.haml
+%%WWWDIR%%/app/views/admin/deploy_keys/edit.html.haml
 %%WWWDIR%%/app/views/admin/deploy_keys/index.html.haml
 %%WWWDIR%%/app/views/admin/deploy_keys/new.html.haml
 %%WWWDIR%%/app/views/admin/groups/_form.html.haml
@@ -3345,6 +3447,10 @@
 %%WWWDIR%%/app/views/admin/groups/new.html.haml
 %%WWWDIR%%/app/views/admin/groups/show.html.haml
 %%WWWDIR%%/app/views/admin/health_check/show.html.haml
+%%WWWDIR%%/app/views/admin/hook_logs/_index.html.haml
+%%WWWDIR%%/app/views/admin/hook_logs/show.html.haml
+%%WWWDIR%%/app/views/admin/hooks/_form.html.haml
+%%WWWDIR%%/app/views/admin/hooks/edit.html.haml
 %%WWWDIR%%/app/views/admin/hooks/index.html.haml
 %%WWWDIR%%/app/views/admin/identities/_form.html.haml
 %%WWWDIR%%/app/views/admin/identities/_identity.html.haml
@@ -3352,6 +3458,7 @@
 %%WWWDIR%%/app/views/admin/identities/index.html.haml
 %%WWWDIR%%/app/views/admin/identities/new.html.haml
 %%WWWDIR%%/app/views/admin/impersonation_tokens/index.html.haml
+%%WWWDIR%%/app/views/admin/jobs/index.html.haml
 %%WWWDIR%%/app/views/admin/keys/show.html.haml
 %%WWWDIR%%/app/views/admin/labels/_form.html.haml
 %%WWWDIR%%/app/views/admin/labels/_label.html.haml
@@ -3360,6 +3467,7 @@
 %%WWWDIR%%/app/views/admin/labels/index.html.haml
 %%WWWDIR%%/app/views/admin/labels/new.html.haml
 %%WWWDIR%%/app/views/admin/logs/show.html.haml
+%%WWWDIR%%/app/views/admin/monitoring/_head.html.haml
 %%WWWDIR%%/app/views/admin/projects/_projects.html.haml
 %%WWWDIR%%/app/views/admin/projects/index.html.haml
 %%WWWDIR%%/app/views/admin/projects/show.html.haml
@@ -3475,7 +3583,6 @@
 %%WWWDIR%%/app/views/events/_event.atom.builder
 %%WWWDIR%%/app/views/events/_event.html.haml
 %%WWWDIR%%/app/views/events/_event_issue.atom.haml
-%%WWWDIR%%/app/views/events/_event_last_push.html.haml
 %%WWWDIR%%/app/views/events/_event_merge_request.atom.haml
 %%WWWDIR%%/app/views/events/_event_note.atom.haml
 %%WWWDIR%%/app/views/events/_event_push.atom.haml
@@ -3583,6 +3690,7 @@
 %%WWWDIR%%/app/views/layouts/group_settings.html.haml
 %%WWWDIR%%/app/views/layouts/header/_default.html.haml
 %%WWWDIR%%/app/views/layouts/header/_empty.html.haml
+%%WWWDIR%%/app/views/layouts/header/_new_dropdown.haml
 %%WWWDIR%%/app/views/layouts/help.html.haml
 %%WWWDIR%%/app/views/layouts/koding.html.haml
 %%WWWDIR%%/app/views/layouts/mailer.html.haml
@@ -3680,8 +3788,12 @@
 %%WWWDIR%%/app/views/notify/repository_push_email.text.haml
 %%WWWDIR%%/app/views/notify/resolved_all_discussions_email.html.haml
 %%WWWDIR%%/app/views/notify/resolved_all_discussions_email.text.erb
+%%WWWDIR%%/app/views/peek/views/_mysql2.html.haml
+%%WWWDIR%%/app/views/peek/views/_pg.html.haml
+%%WWWDIR%%/app/views/peek/views/_sql.html.haml
 %%WWWDIR%%/app/views/profiles/_event_table.html.haml
 %%WWWDIR%%/app/views/profiles/_head.html.haml
+%%WWWDIR%%/app/views/profiles/accounts/_reset_token.html.haml
 %%WWWDIR%%/app/views/profiles/accounts/show.html.haml
 %%WWWDIR%%/app/views/profiles/audit_log.html.haml
 %%WWWDIR%%/app/views/profiles/chat_names/_chat_name.html.haml
@@ -3718,12 +3830,10 @@
 %%WWWDIR%%/app/views/projects/_gitlab_import_modal.html.haml
 %%WWWDIR%%/app/views/projects/_head.html.haml
 %%WWWDIR%%/app/views/projects/_home_panel.html.haml
-%%WWWDIR%%/app/views/projects/_last_commit.html.haml
 %%WWWDIR%%/app/views/projects/_last_push.html.haml
 %%WWWDIR%%/app/views/projects/_md_preview.html.haml
 %%WWWDIR%%/app/views/projects/_merge_request_merge_settings.html.haml
 %%WWWDIR%%/app/views/projects/_merge_request_settings.html.haml
-%%WWWDIR%%/app/views/projects/_readme.html.haml
 %%WWWDIR%%/app/views/projects/_visibility_select.html.haml
 %%WWWDIR%%/app/views/projects/_wiki.html.haml
 %%WWWDIR%%/app/views/projects/_zen.html.haml
@@ -3734,12 +3844,13 @@
 %%WWWDIR%%/app/views/projects/artifacts/file.html.haml
 %%WWWDIR%%/app/views/projects/badges/badge.svg.erb
 %%WWWDIR%%/app/views/projects/blame/show.html.haml
+%%WWWDIR%%/app/views/projects/blob/_auxiliary_viewer.html.haml
 %%WWWDIR%%/app/views/projects/blob/_blob.html.haml
+%%WWWDIR%%/app/views/projects/blob/_breadcrumb.html.haml
 %%WWWDIR%%/app/views/projects/blob/_content.html.haml
 %%WWWDIR%%/app/views/projects/blob/_editor.html.haml
 %%WWWDIR%%/app/views/projects/blob/_header.html.haml
 %%WWWDIR%%/app/views/projects/blob/_header_content.html.haml
-%%WWWDIR%%/app/views/projects/blob/_markup.html.haml
 %%WWWDIR%%/app/views/projects/blob/_new_dir.html.haml
 %%WWWDIR%%/app/views/projects/blob/_remove.html.haml
 %%WWWDIR%%/app/views/projects/blob/_render_error.html.haml
@@ -3753,12 +3864,23 @@
 %%WWWDIR%%/app/views/projects/blob/preview.html.haml
 %%WWWDIR%%/app/views/projects/blob/show.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_balsamiq.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_changelog.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_contributing.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_dependency_manager.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_download.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_empty.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_gitlab_ci_yml.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_gitlab_ci_yml_loading.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_image.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_license.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_loading.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_loading_auxiliary.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_markup.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_notebook.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_pdf.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_readme.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_route_map.html.haml
+%%WWWDIR%%/app/views/projects/blob/viewers/_route_map_loading.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_sketch.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_stl.html.haml
 %%WWWDIR%%/app/views/projects/blob/viewers/_svg.html.haml
@@ -3776,14 +3898,9 @@
 %%WWWDIR%%/app/views/projects/boards/show.html.haml
 %%WWWDIR%%/app/views/projects/branches/_branch.html.haml
 %%WWWDIR%%/app/views/projects/branches/_commit.html.haml
+%%WWWDIR%%/app/views/projects/branches/_delete_protected_modal.html.haml
 %%WWWDIR%%/app/views/projects/branches/index.html.haml
 %%WWWDIR%%/app/views/projects/branches/new.html.haml
-%%WWWDIR%%/app/views/projects/builds/_header.html.haml
-%%WWWDIR%%/app/views/projects/builds/_sidebar.html.haml
-%%WWWDIR%%/app/views/projects/builds/_table.html.haml
-%%WWWDIR%%/app/views/projects/builds/_user.html.haml
-%%WWWDIR%%/app/views/projects/builds/index.html.haml
-%%WWWDIR%%/app/views/projects/builds/show.html.haml
 %%WWWDIR%%/app/views/projects/buttons/_download.html.haml
 %%WWWDIR%%/app/views/projects/buttons/_dropdown.html.haml
 %%WWWDIR%%/app/views/projects/buttons/_fork.html.haml
@@ -3793,7 +3910,6 @@
 %%WWWDIR%%/app/views/projects/commit/_change.html.haml
 %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml
 %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml
-%%WWWDIR%%/app/views/projects/commit/_pipeline.html.haml
 %%WWWDIR%%/app/views/projects/commit/_pipelines_list.haml
 %%WWWDIR%%/app/views/projects/commit/branches.html.haml
 %%WWWDIR%%/app/views/projects/commit/pipelines.html.haml
@@ -3813,10 +3929,9 @@
 %%WWWDIR%%/app/views/projects/cycle_analytics/_no_access.html.haml
 %%WWWDIR%%/app/views/projects/cycle_analytics/_overview.html.haml
 %%WWWDIR%%/app/views/projects/cycle_analytics/show.html.haml
-%%WWWDIR%%/app/views/projects/deploy_keys/_deploy_key.html.haml
 %%WWWDIR%%/app/views/projects/deploy_keys/_form.html.haml
 %%WWWDIR%%/app/views/projects/deploy_keys/_index.html.haml
-%%WWWDIR%%/app/views/projects/deploy_keys/new.html.haml
+%%WWWDIR%%/app/views/projects/deploy_keys/edit.html.haml
 %%WWWDIR%%/app/views/projects/deployments/_actions.haml
 %%WWWDIR%%/app/views/projects/deployments/_commit.html.haml
 %%WWWDIR%%/app/views/projects/deployments/_deployment.html.haml
@@ -3825,12 +3940,13 @@
 %%WWWDIR%%/app/views/projects/diffs/_diffs.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_file.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_file_header.html.haml
-%%WWWDIR%%/app/views/projects/diffs/_image.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_line.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_parallel_view.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_stats.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_text_file.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_warning.html.haml
+%%WWWDIR%%/app/views/projects/diffs/viewers/_image.html.haml
+%%WWWDIR%%/app/views/projects/diffs/viewers/_text.html.haml
 %%WWWDIR%%/app/views/projects/edit.html.haml
 %%WWWDIR%%/app/views/projects/empty.html.haml
 %%WWWDIR%%/app/views/projects/environments/_external_url.html.haml
@@ -3853,8 +3969,9 @@
 %%WWWDIR%%/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
 %%WWWDIR%%/app/views/projects/graphs/charts.html.haml
 %%WWWDIR%%/app/views/projects/graphs/show.html.haml
-%%WWWDIR%%/app/views/projects/group_links/_index.html.haml
 %%WWWDIR%%/app/views/projects/group_links/update.js.haml
+%%WWWDIR%%/app/views/projects/hook_logs/_index.html.haml
+%%WWWDIR%%/app/views/projects/hook_logs/show.html.haml
 %%WWWDIR%%/app/views/projects/hooks/_index.html.haml
 %%WWWDIR%%/app/views/projects/hooks/edit.html.haml
 %%WWWDIR%%/app/views/projects/imports/new.html.haml
@@ -3875,6 +3992,12 @@
 %%WWWDIR%%/app/views/projects/issues/new.html.haml
 %%WWWDIR%%/app/views/projects/issues/show.html.haml
 %%WWWDIR%%/app/views/projects/issues/verify.html.haml
+%%WWWDIR%%/app/views/projects/jobs/_header.html.haml
+%%WWWDIR%%/app/views/projects/jobs/_sidebar.html.haml
+%%WWWDIR%%/app/views/projects/jobs/_table.html.haml
+%%WWWDIR%%/app/views/projects/jobs/_user.html.haml
+%%WWWDIR%%/app/views/projects/jobs/index.html.haml
+%%WWWDIR%%/app/views/projects/jobs/show.html.haml
 %%WWWDIR%%/app/views/projects/labels/edit.html.haml
 %%WWWDIR%%/app/views/projects/labels/index.html.haml
 %%WWWDIR%%/app/views/projects/labels/new.html.haml
@@ -3930,6 +4053,7 @@
 %%WWWDIR%%/app/views/projects/no_repo.html.haml
 %%WWWDIR%%/app/views/projects/notes/_actions.html.haml
 %%WWWDIR%%/app/views/projects/notes/_form_errors.html.haml
+%%WWWDIR%%/app/views/projects/notes/_more_actions_dropdown.html.haml
 %%WWWDIR%%/app/views/projects/pages/_access.html.haml
 %%WWWDIR%%/app/views/projects/pages/_destroy.haml
 %%WWWDIR%%/app/views/projects/pages/_list.html.haml
@@ -3963,6 +4087,7 @@
 %%WWWDIR%%/app/views/projects/project_members/_groups.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_index.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml
+%%WWWDIR%%/app/views/projects/project_members/_new_shared_group.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_shared_group_members.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_team.html.haml
 %%WWWDIR%%/app/views/projects/project_members/import.html.haml
@@ -4079,7 +4204,6 @@
 %%WWWDIR%%/app/views/search/show.html.haml
 %%WWWDIR%%/app/views/sent_notifications/unsubscribe.html.haml
 %%WWWDIR%%/app/views/shared/_allow_request_access.html.haml
-%%WWWDIR%%/app/views/shared/_branch_switcher.html.haml
 %%WWWDIR%%/app/views/shared/_choose_group_avatar_button.html.haml
 %%WWWDIR%%/app/views/shared/_clone_panel.html.haml
 %%WWWDIR%%/app/views/shared/_commit_message_container.html.haml
@@ -4104,6 +4228,7 @@
 %%WWWDIR%%/app/views/shared/_mr_head.html.haml
 %%WWWDIR%%/app/views/shared/_nav_scroll.html.haml
 %%WWWDIR%%/app/views/shared/_new_commit_form.html.haml
+%%WWWDIR%%/app/views/shared/_new_merge_request_checkbox.html.haml
 %%WWWDIR%%/app/views/shared/_new_project_item_select.html.haml
 %%WWWDIR%%/app/views/shared/_no_password.html.haml
 %%WWWDIR%%/app/views/shared/_no_ssh.html.haml
@@ -4121,6 +4246,7 @@
 %%WWWDIR%%/app/views/shared/_visibility_level.html.haml
 %%WWWDIR%%/app/views/shared/_visibility_radios.html.haml
 %%WWWDIR%%/app/views/shared/builds/_tabs.html.haml
+%%WWWDIR%%/app/views/shared/deploy_keys/_form.html.haml
 %%WWWDIR%%/app/views/shared/empty_states/_issues.html.haml
 %%WWWDIR%%/app/views/shared/empty_states/_labels.html.haml
 %%WWWDIR%%/app/views/shared/empty_states/_merge_requests.html.haml
@@ -4137,16 +4263,32 @@
 %%WWWDIR%%/app/views/shared/empty_states/monitoring/_loading.svg
 %%WWWDIR%%/app/views/shared/empty_states/monitoring/_unable_to_connect.svg
 %%WWWDIR%%/app/views/shared/errors/_graphic_422.svg
+%%WWWDIR%%/app/views/shared/form_elements/_description.html.haml
 %%WWWDIR%%/app/views/shared/groups/_dropdown.html.haml
 %%WWWDIR%%/app/views/shared/groups/_group.html.haml
 %%WWWDIR%%/app/views/shared/groups/_list.html.haml
 %%WWWDIR%%/app/views/shared/groups/_search_form.html.haml
+%%WWWDIR%%/app/views/shared/hook_logs/_content.html.haml
+%%WWWDIR%%/app/views/shared/hook_logs/_status_label.html.haml
 %%WWWDIR%%/app/views/shared/icons/_collapse.svg.erb
+%%WWWDIR%%/app/views/shared/icons/_convdev_no_data.svg
+%%WWWDIR%%/app/views/shared/icons/_convdev_no_index.svg
+%%WWWDIR%%/app/views/shared/icons/_convdev_overview.svg
 %%WWWDIR%%/app/views/shared/icons/_emoji_slightly_smiling_face.svg
 %%WWWDIR%%/app/views/shared/icons/_emoji_smile.svg
 %%WWWDIR%%/app/views/shared/icons/_emoji_smiley.svg
 %%WWWDIR%%/app/views/shared/icons/_go_logo.svg.erb
 %%WWWDIR%%/app/views/shared/icons/_group.svg.erb
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_1.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_10.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_2.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_3.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_4.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_5.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_6.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_7.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_8.svg
+%%WWWDIR%%/app/views/shared/icons/_i2p_step_9.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_action_cancel.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_action_play.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_action_retry.svg
@@ -4167,6 +4309,7 @@
 %%WWWDIR%%/app/views/shared/icons/_icon_eye.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_eye_slash.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_fork.svg
+%%WWWDIR%%/app/views/shared/icons/_icon_history.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_lock.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_mattermost.svg
 %%WWWDIR%%/app/views/shared/icons/_icon_merge.svg
@@ -4208,13 +4351,13 @@
 %%WWWDIR%%/app/views/shared/icons/_issues.svg.erb
 %%WWWDIR%%/app/views/shared/icons/_mattermost_logo.svg.erb
 %%WWWDIR%%/app/views/shared/icons/_mr_bold.svg
+%%WWWDIR%%/app/views/shared/icons/_mr_widget_empty_state.svg
 %%WWWDIR%%/app/views/shared/icons/_next_discussion.svg
 %%WWWDIR%%/app/views/shared/icons/_project.svg.erb
 %%WWWDIR%%/app/views/shared/icons/_scroll_down.svg
-%%WWWDIR%%/app/views/shared/icons/_scroll_down_hover_active.svg
 %%WWWDIR%%/app/views/shared/icons/_scroll_up.svg
-%%WWWDIR%%/app/views/shared/icons/_scroll_up_hover_active.svg
 %%WWWDIR%%/app/views/shared/issuable/_assignees.html.haml
+%%WWWDIR%%/app/views/shared/issuable/_bulk_update_sidebar.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_filter.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_form.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_label_dropdown.html.haml
@@ -4228,8 +4371,8 @@
 %%WWWDIR%%/app/views/shared/issuable/_sidebar.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_sidebar_assignees.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_sidebar_todo.html.haml
+%%WWWDIR%%/app/views/shared/issuable/_user_dropdown_item.html.haml
 %%WWWDIR%%/app/views/shared/issuable/form/_branch_chooser.html.haml
-%%WWWDIR%%/app/views/shared/issuable/form/_description.html.haml
 %%WWWDIR%%/app/views/shared/issuable/form/_issue_assignee.html.haml
 %%WWWDIR%%/app/views/shared/issuable/form/_merge_params.html.haml
 %%WWWDIR%%/app/views/shared/issuable/form/_merge_request_assignee.html.haml
@@ -4271,8 +4414,6 @@
 %%WWWDIR%%/app/views/shared/projects/_list.html.haml
 %%WWWDIR%%/app/views/shared/projects/_project.html.haml
 %%WWWDIR%%/app/views/shared/projects/_search_form.html.haml
-%%WWWDIR%%/app/views/shared/projects/blob/_branch_page_create.html.haml
-%%WWWDIR%%/app/views/shared/projects/blob/_branch_page_default.html.haml
 %%WWWDIR%%/app/views/shared/snippets/_blob.html.haml
 %%WWWDIR%%/app/views/shared/snippets/_form.html.haml
 %%WWWDIR%%/app/views/shared/snippets/_header.html.haml
@@ -4333,6 +4474,7 @@
 %%WWWDIR%%/app/workers/import_export_project_cleanup_worker.rb
 %%WWWDIR%%/app/workers/irker_worker.rb
 %%WWWDIR%%/app/workers/merge_worker.rb
+%%WWWDIR%%/app/workers/namespaceless_project_destroy_worker.rb
 %%WWWDIR%%/app/workers/new_note_worker.rb
 %%WWWDIR%%/app/workers/pages_worker.rb
 %%WWWDIR%%/app/workers/pipeline_hooks_worker.rb
@@ -4348,12 +4490,12 @@
 %%WWWDIR%%/app/workers/project_destroy_worker.rb
 %%WWWDIR%%/app/workers/project_export_worker.rb
 %%WWWDIR%%/app/workers/project_service_worker.rb
-%%WWWDIR%%/app/workers/project_web_hook_worker.rb
 %%WWWDIR%%/app/workers/propagate_service_template_worker.rb
 %%WWWDIR%%/app/workers/prune_old_events_worker.rb
 %%WWWDIR%%/app/workers/reactive_caching_worker.rb
 %%WWWDIR%%/app/workers/remove_expired_group_links_worker.rb
 %%WWWDIR%%/app/workers/remove_expired_members_worker.rb
+%%WWWDIR%%/app/workers/remove_old_web_hook_logs_worker.rb
 %%WWWDIR%%/app/workers/remove_unreferenced_lfs_objects_worker.rb
 %%WWWDIR%%/app/workers/repository_archive_cache_worker.rb
 %%WWWDIR%%/app/workers/repository_check/batch_worker.rb
@@ -4366,12 +4508,12 @@
 %%WWWDIR%%/app/workers/stuck_ci_jobs_worker.rb
 %%WWWDIR%%/app/workers/stuck_import_jobs_worker.rb
 %%WWWDIR%%/app/workers/system_hook_push_worker.rb
-%%WWWDIR%%/app/workers/system_hook_worker.rb
 %%WWWDIR%%/app/workers/trending_projects_worker.rb
 %%WWWDIR%%/app/workers/update_merge_requests_worker.rb
 %%WWWDIR%%/app/workers/update_user_activity_worker.rb
 %%WWWDIR%%/app/workers/upload_checksum_worker.rb
 %%WWWDIR%%/app/workers/use_key_worker.rb
+%%WWWDIR%%/app/workers/web_hook_worker.rb
 @(git,,544) %%WWWDIR%%/bin/background_jobs
 @(git,,544) %%WWWDIR%%/bin/bundle
 @(git,,544) %%WWWDIR%%/bin/changelog
@@ -4394,6 +4536,7 @@
 %%WWWDIR%%/changelogs/archive.md
 %%WWWDIR%%/changelogs/unreleased/22619-add-an-email-address-to-unsubscribe-list-header-in-email
 %%WWWDIR%%/changelogs/unreleased/26908-make-timelogs-use-foreign-keys
+%%WWWDIR%%/changelogs/unreleased/32340-correct-jobs-api-documentation
 %%WWWDIR%%/changelogs/unreleased/add-mock-deployment-and-monitoring-service-for-development.yaml
 %%WWWDIR%%/changelogs/unreleased/repository-name-emojis
 %%WWWDIR%%/config.ru
@@ -4409,6 +4552,7 @@
 %%WWWDIR%%/config/environments/development.rb
 %%WWWDIR%%/config/environments/production.rb
 %%WWWDIR%%/config/environments/test.rb
+%%WWWDIR%%/config/initializers/0_acts_as_taggable.rb
 %%WWWDIR%%/config/initializers/0_inflections.rb
 %%WWWDIR%%/config/initializers/0_post_deployment_migrations.rb
 %%WWWDIR%%/config/initializers/1_settings.rb
@@ -4418,10 +4562,10 @@
 %%WWWDIR%%/config/initializers/7_redis.rb
 %%WWWDIR%%/config/initializers/8_gitaly.rb
 %%WWWDIR%%/config/initializers/8_metrics.rb
-%%WWWDIR%%/config/initializers/acts_as_taggable.rb
+%%WWWDIR%%/config/initializers/active_record_locking.rb
+%%WWWDIR%%/config/initializers/active_record_preloader.rb
 %%WWWDIR%%/config/initializers/additional_headers_interceptor.rb
 %%WWWDIR%%/config/initializers/ar5_batching.rb
-%%WWWDIR%%/config/initializers/ar_monkey_patch.rb
 %%WWWDIR%%/config/initializers/ar_speed_up_migration_checking.rb
 %%WWWDIR%%/config/initializers/attr_encrypted_no_db_connection.rb
 %%WWWDIR%%/config/initializers/backtrace_silencers.rb
@@ -4441,6 +4585,8 @@
 %%WWWDIR%%/config/initializers/etag_caching.rb
 %%WWWDIR%%/config/initializers/fast_gettext.rb
 %%WWWDIR%%/config/initializers/fix_local_cache_middleware.rb
+%%WWWDIR%%/config/initializers/flipper.rb
+%%WWWDIR%%/config/initializers/forbid_sidekiq_in_transactions.rb
 %%WWWDIR%%/config/initializers/gettext_rails_i18n_patch.rb
 %%WWWDIR%%/config/initializers/gitlab_shell_secret_token.rb
 %%WWWDIR%%/config/initializers/gitlab_workhorse_secret.rb
@@ -4453,7 +4599,9 @@
 %%WWWDIR%%/config/initializers/mime_types.rb
 %%WWWDIR%%/config/initializers/mysql_ignore_postgresql_options.rb
 %%WWWDIR%%/config/initializers/omniauth.rb
+%%WWWDIR%%/config/initializers/peek.rb
 %%WWWDIR%%/config/initializers/plantuml_lexer.rb
+%%WWWDIR%%/config/initializers/postgresql_cte.rb
 %%WWWDIR%%/config/initializers/postgresql_limit_fix.rb
 %%WWWDIR%%/config/initializers/postgresql_opclasses_support.rb
 %%WWWDIR%%/config/initializers/premailer.rb
@@ -4468,6 +4616,7 @@
 %%WWWDIR%%/config/initializers/rspec_profiling.rb
 %%WWWDIR%%/config/initializers/secret_token.rb
 %%WWWDIR%%/config/initializers/sentry.rb
+%%WWWDIR%%/config/initializers/server_uptime.rb
 %%WWWDIR%%/config/initializers/session_store.rb
 %%WWWDIR%%/config/initializers/sherlock.rb
 %%WWWDIR%%/config/initializers/sidekiq.rb
@@ -4530,6 +4679,7 @@
 %%WWWDIR%%/db/fixtures/development/18_abuse_reports.rb
 %%WWWDIR%%/db/fixtures/development/19_environments.rb
 %%WWWDIR%%/db/fixtures/development/20_nested_groups.rb
+%%WWWDIR%%/db/fixtures/development/21_conversational_development_index_metrics.rb
 %%WWWDIR%%/db/fixtures/production/001_admin.rb
 %%WWWDIR%%/db/fixtures/production/010_settings.rb
 %%WWWDIR%%/db/migrate/20121220064453_init_schema.rb
@@ -5124,21 +5274,47 @@
 %%WWWDIR%%/db/migrate/20170425114731_add_pipeline_schedule_id_to_pipelines.rb
 %%WWWDIR%%/db/migrate/20170426175636_fill_missing_uuid_on_application_settings.rb
 %%WWWDIR%%/db/migrate/20170426181740_add_index_on_ci_runners_contacted_at.rb
+%%WWWDIR%%/db/migrate/20170427103502_create_web_hook_logs.rb
 %%WWWDIR%%/db/migrate/20170427215854_create_redirect_routes.rb
+%%WWWDIR%%/db/migrate/20170502065653_make_auto_cancel_pending_pipelines_on_by_default.rb
 %%WWWDIR%%/db/migrate/20170502091007_markdown_cache_limits_to_mysql.rb
+%%WWWDIR%%/db/migrate/20170502135553_create_index_ci_pipelines_auto_canceled_by_id.rb
+%%WWWDIR%%/db/migrate/20170502140503_create_index_ci_builds_auto_canceled_by_id.rb
 %%WWWDIR%%/db/migrate/20170503004125_add_last_repository_updated_at_to_projects.rb
 %%WWWDIR%%/db/migrate/20170503004425_add_index_to_last_repository_updated_at_on_projects.rb
 %%WWWDIR%%/db/migrate/20170503004426_add_retried_to_ci_build.rb
 %%WWWDIR%%/db/migrate/20170503021915_add_last_edited_at_and_last_edited_by_id_to_issues.rb
 %%WWWDIR%%/db/migrate/20170503022548_add_last_edited_at_and_last_edited_by_id_to_merge_requests.rb
+%%WWWDIR%%/db/migrate/20170503023315_add_repository_update_events_to_web_hooks.rb
+%%WWWDIR%%/db/migrate/20170503114228_add_description_to_snippets.rb
+%%WWWDIR%%/db/migrate/20170503140201_reschedule_project_authorizations.rb
+%%WWWDIR%%/db/migrate/20170503140202_turn_nested_groups_into_regular_groups_for_mysql.rb
 %%WWWDIR%%/db/migrate/20170503184421_add_index_to_redirect_routes.rb
 %%WWWDIR%%/db/migrate/20170503185032_index_redirect_routes_path_for_like.rb
 %%WWWDIR%%/db/migrate/20170504102911_add_clientside_sentry_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20170504182103_add_index_project_group_links_group_id.rb
 %%WWWDIR%%/db/migrate/20170506085040_add_index_to_pipeline_pipeline_schedule_id.rb
 %%WWWDIR%%/db/migrate/20170506091344_add_foreign_key_to_pipeline_schedules.rb
 %%WWWDIR%%/db/migrate/20170506185517_add_foreign_key_pipeline_schedules_and_pipelines.rb
+%%WWWDIR%%/db/migrate/20170507205316_add_head_pipeline_id_to_merge_requests.rb
+%%WWWDIR%%/db/migrate/20170508153950_add_not_null_contraints_to_ci_variables.rb
+%%WWWDIR%%/db/migrate/20170508190732_add_foreign_key_to_ci_variables.rb
+%%WWWDIR%%/db/migrate/20170511082759_rename_web_hooks_build_events_to_job_events.rb
+%%WWWDIR%%/db/migrate/20170511083824_rename_services_build_events_to_job_events.rb
 %%WWWDIR%%/db/migrate/20170516153305_migrate_assignee_to_separate_table.rb
 %%WWWDIR%%/db/migrate/20170516183131_add_indices_to_issue_assignees.rb
+%%WWWDIR%%/db/migrate/20170519102115_add_prometheus_settings_to_metrics_settings.rb
+%%WWWDIR%%/db/migrate/20170521184006_add_change_position_to_notes.rb
+%%WWWDIR%%/db/migrate/20170523091700_add_rss_token_to_users.rb
+%%WWWDIR%%/db/migrate/20170523121229_create_conversational_development_index_metrics.rb
+%%WWWDIR%%/db/migrate/20170524125940_add_source_to_ci_pipeline.rb
+%%WWWDIR%%/db/migrate/20170524161101_add_protected_to_ci_variables.rb
+%%WWWDIR%%/db/migrate/20170525132202_create_pipeline_stages.rb
+%%WWWDIR%%/db/migrate/20170525174156_create_feature_tables.rb
+%%WWWDIR%%/db/migrate/20170526185602_add_stage_id_to_ci_builds.rb
+%%WWWDIR%%/db/migrate/20170531202042_rename_users_ldap_email_to_external_email.rb
+%%WWWDIR%%/db/migrate/20170603200744_add_email_provider_to_users.rb
+%%WWWDIR%%/db/migrate/20170619144837_add_index_for_head_pipeline_merge_request.rb
 %%WWWDIR%%/db/migrate/limits_to_mysql.rb
 %%WWWDIR%%/db/migrate/markdown_cache_limits_to_mysql.rb
 %%WWWDIR%%/db/post_migrate/20160824121037_change_personal_access_tokens_default_back_to_empty_array.rb
@@ -5171,13 +5347,29 @@
 %%WWWDIR%%/db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
 %%WWWDIR%%/db/post_migrate/20170425121605_migrate_trigger_schedules_to_pipeline_schedules.rb
 %%WWWDIR%%/db/post_migrate/20170425130047_drop_ci_trigger_schedules_table.rb
+%%WWWDIR%%/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
+%%WWWDIR%%/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
 %%WWWDIR%%/db/post_migrate/20170503004427_update_retried_for_ci_build.rb
+%%WWWDIR%%/db/post_migrate/20170503120310_remove_users_authorized_projects_populated.rb
+%%WWWDIR%%/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
+%%WWWDIR%%/db/post_migrate/20170510101043_add_foreign_key_on_pipeline_schedule_owner.rb
+%%WWWDIR%%/db/post_migrate/20170511100900_cleanup_rename_web_hooks_build_events_to_job_events.rb
+%%WWWDIR%%/db/post_migrate/20170511101000_cleanup_rename_services_build_events_to_job_events.rb
 %%WWWDIR%%/db/post_migrate/20170516165238_cleanup_trigger_for_issues.rb
 %%WWWDIR%%/db/post_migrate/20170516181025_add_constraints_to_issue_assignees_table.rb
 %%WWWDIR%%/db/post_migrate/20170518200835_rename_users_with_renamed_namespace.rb
 %%WWWDIR%%/db/post_migrate/20170518231126_fix_wrongly_renamed_routes.rb
+%%WWWDIR%%/db/post_migrate/20170523083112_migrate_old_artifacts.rb
+%%WWWDIR%%/db/post_migrate/20170526185842_migrate_pipeline_stages.rb
+%%WWWDIR%%/db/post_migrate/20170526185858_create_index_in_pipeline_stages.rb
+%%WWWDIR%%/db/post_migrate/20170526185901_remove_stage_id_index_from_builds.rb
+%%WWWDIR%%/db/post_migrate/20170526185921_migrate_build_stage_reference.rb
+%%WWWDIR%%/db/post_migrate/20170526190000_migrate_build_stage_reference_again.rb
+%%WWWDIR%%/db/post_migrate/20170531203055_cleanup_users_ldap_email_rename.rb
 %%WWWDIR%%/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb
+%%WWWDIR%%/db/post_migrate/20170612071012_move_personal_snippets_files.rb
 %%WWWDIR%%/db/post_migrate/20170613111224_clean_appearance_symlinks.rb
+%%WWWDIR%%/db/post_migrate/20170621102400_add_stage_id_index_to_builds.rb
 @(git,,) %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
 %%WWWDIR%%/doc/README.md
@@ -5230,6 +5422,7 @@
 %%WWWDIR%%/doc/administration/monitoring/performance/introduction.md
 %%WWWDIR%%/doc/administration/monitoring/performance/prometheus.md
 %%WWWDIR%%/doc/administration/monitoring/performance/request_profiling.md
+%%WWWDIR%%/doc/administration/monitoring/prometheus/gitlab_metrics.md
 %%WWWDIR%%/doc/administration/monitoring/prometheus/gitlab_monitor_exporter.md
 %%WWWDIR%%/doc/administration/monitoring/prometheus/index.md
 %%WWWDIR%%/doc/administration/monitoring/prometheus/node_exporter.md
@@ -5276,7 +5469,9 @@
 %%WWWDIR%%/doc/api/deploy_key_multiple_projects.md
 %%WWWDIR%%/doc/api/deploy_keys.md
 %%WWWDIR%%/doc/api/deployments.md
-%%WWWDIR%%/doc/api/enviroments.md
+%%WWWDIR%%/doc/api/environments.md
+%%WWWDIR%%/doc/api/events.md
+%%WWWDIR%%/doc/api/features.md
 %%WWWDIR%%/doc/api/groups.md
 %%WWWDIR%%/doc/api/issues.md
 %%WWWDIR%%/doc/api/jobs.md
@@ -5289,6 +5484,7 @@
 %%WWWDIR%%/doc/api/notes.md
 %%WWWDIR%%/doc/api/notification_settings.md
 %%WWWDIR%%/doc/api/oauth2.md
+%%WWWDIR%%/doc/api/pipeline_schedules.md
 %%WWWDIR%%/doc/api/pipeline_triggers.md
 %%WWWDIR%%/doc/api/pipelines.md
 %%WWWDIR%%/doc/api/project_snippets.md
@@ -5314,6 +5510,7 @@
 %%WWWDIR%%/doc/articles/how_to_configure_ldap_gitlab_ce/img/ldap_ou.gif
 %%WWWDIR%%/doc/articles/how_to_configure_ldap_gitlab_ce/img/user_auth.gif
 %%WWWDIR%%/doc/articles/how_to_configure_ldap_gitlab_ce/index.md
+%%WWWDIR%%/doc/articles/how_to_install_git/index.md
 %%WWWDIR%%/doc/articles/index.md
 %%WWWDIR%%/doc/ci/README.md
 %%WWWDIR%%/doc/ci/api/README.md
@@ -5329,6 +5526,7 @@
 %%WWWDIR%%/doc/ci/enable_or_disable_ci.md
 %%WWWDIR%%/doc/ci/environments.md
 %%WWWDIR%%/doc/ci/examples/README.md
+%%WWWDIR%%/doc/ci/examples/code_climate.md
 %%WWWDIR%%/doc/ci/examples/deployment/README.md
 %%WWWDIR%%/doc/ci/examples/deployment/composer-npm-deploy.md
 %%WWWDIR%%/doc/ci/examples/php.md
@@ -5381,8 +5579,7 @@
 %%WWWDIR%%/doc/ci/review_apps/img/review_apps_preview_in_mr.png
 %%WWWDIR%%/doc/ci/review_apps/index.md
 %%WWWDIR%%/doc/ci/runners/README.md
-%%WWWDIR%%/doc/ci/runners/project_specific.png
-%%WWWDIR%%/doc/ci/runners/shared_runner.png
+%%WWWDIR%%/doc/ci/runners/img/shared_runners_admin.png
 %%WWWDIR%%/doc/ci/runners/shared_to_specific_admin.png
 %%WWWDIR%%/doc/ci/services/README.md
 %%WWWDIR%%/doc/ci/services/docker-services.md
@@ -5427,6 +5624,7 @@
 %%WWWDIR%%/doc/development/fe_guide/droplab/plugins/filter.md
 %%WWWDIR%%/doc/development/fe_guide/droplab/plugins/input_setter.md
 %%WWWDIR%%/doc/development/fe_guide/img/boards_diagram.png
+%%WWWDIR%%/doc/development/fe_guide/img/testing_triangle.png
 %%WWWDIR%%/doc/development/fe_guide/img/vue_arch.png
 %%WWWDIR%%/doc/development/fe_guide/index.md
 %%WWWDIR%%/doc/development/fe_guide/performance.md
@@ -5435,6 +5633,8 @@
 %%WWWDIR%%/doc/development/fe_guide/style_guide_scss.md
 %%WWWDIR%%/doc/development/fe_guide/testing.md
 %%WWWDIR%%/doc/development/fe_guide/vue.md
+%%WWWDIR%%/doc/development/feature_flags.md
+%%WWWDIR%%/doc/development/foreign_keys.md
 %%WWWDIR%%/doc/development/frontend.md
 %%WWWDIR%%/doc/development/gemfile.md
 %%WWWDIR%%/doc/development/gitlab_architecture_diagram.png
@@ -5446,6 +5646,8 @@
 %%WWWDIR%%/doc/development/img/state-model-issue.png
 %%WWWDIR%%/doc/development/img/state-model-legend.png
 %%WWWDIR%%/doc/development/img/state-model-merge-request.png
+%%WWWDIR%%/doc/development/img/trigger_ss1.png
+%%WWWDIR%%/doc/development/img/trigger_ss2.png
 %%WWWDIR%%/doc/development/instrumentation.md
 %%WWWDIR%%/doc/development/licensing.md
 %%WWWDIR%%/doc/development/limit_ee_conflicts.md
@@ -5456,14 +5658,17 @@
 %%WWWDIR%%/doc/development/omnibus.md
 %%WWWDIR%%/doc/development/performance.md
 %%WWWDIR%%/doc/development/polling.md
+%%WWWDIR%%/doc/development/polymorphic_associations.md
 %%WWWDIR%%/doc/development/post_deployment_migrations.md
 %%WWWDIR%%/doc/development/profiling.md
 %%WWWDIR%%/doc/development/query_recorder.md
 %%WWWDIR%%/doc/development/rake_tasks.md
+%%WWWDIR%%/doc/development/serializing_data.md
 %%WWWDIR%%/doc/development/shared_files.md
 %%WWWDIR%%/doc/development/shell_commands.md
 %%WWWDIR%%/doc/development/sidekiq_debugging.md
 %%WWWDIR%%/doc/development/sidekiq_style_guide.md
+%%WWWDIR%%/doc/development/single_table_inheritance.md
 %%WWWDIR%%/doc/development/sql.md
 %%WWWDIR%%/doc/development/testing.md
 %%WWWDIR%%/doc/development/ui_guide.md
@@ -5865,6 +6070,7 @@
 %%WWWDIR%%/doc/update/8.9-to-8.10.md
 %%WWWDIR%%/doc/update/9.0-to-9.1.md
 %%WWWDIR%%/doc/update/9.1-to-9.2.md
+%%WWWDIR%%/doc/update/9.2-to-9.3.md
 %%WWWDIR%%/doc/update/README.md
 %%WWWDIR%%/doc/update/mysql_to_postgresql.md
 %%WWWDIR%%/doc/update/patch_versions.md
@@ -5876,7 +6082,9 @@
 %%WWWDIR%%/doc/user/admin_area/img/admin_labels.png
 %%WWWDIR%%/doc/user/admin_area/img/cohorts.png
 %%WWWDIR%%/doc/user/admin_area/labels.md
+%%WWWDIR%%/doc/user/admin_area/monitoring/convdev.md
 %%WWWDIR%%/doc/user/admin_area/monitoring/health_check.md
+%%WWWDIR%%/doc/user/admin_area/monitoring/img/convdev_index.png
 %%WWWDIR%%/doc/user/admin_area/monitoring/img/health_check_token.png
 %%WWWDIR%%/doc/user/admin_area/settings/continuous_integration.md
 %%WWWDIR%%/doc/user/admin_area/settings/img/access_restrictions.png
@@ -5926,6 +6134,8 @@
 %%WWWDIR%%/doc/user/profile/account/img/2fa_u2f_register.png
 %%WWWDIR%%/doc/user/profile/account/index.md
 %%WWWDIR%%/doc/user/profile/account/two_factor_authentication.md
+%%WWWDIR%%/doc/user/profile/img/personal_access_tokens.png
+%%WWWDIR%%/doc/user/profile/personal_access_tokens.md
 %%WWWDIR%%/doc/user/profile/preferences.md
 %%WWWDIR%%/doc/user/project/builds/artifacts.md
 %%WWWDIR%%/doc/user/project/container_registry.md
@@ -5934,7 +6144,6 @@
 %%WWWDIR%%/doc/user/project/git_attributes.md
 %%WWWDIR%%/doc/user/project/highlighting.md
 %%WWWDIR%%/doc/user/project/img/container_registry_enable.png
-%%WWWDIR%%/doc/user/project/img/container_registry_panel.png
 %%WWWDIR%%/doc/user/project/img/container_registry_tab.png
 %%WWWDIR%%/doc/user/project/img/cycle_analytics_landing_page.png
 %%WWWDIR%%/doc/user/project/img/description_templates.png
@@ -5973,8 +6182,8 @@
 %%WWWDIR%%/doc/user/project/img/labels_subscribe.png
 %%WWWDIR%%/doc/user/project/img/mitmproxy-docker.png
 %%WWWDIR%%/doc/user/project/img/project_repository_settings.png
-%%WWWDIR%%/doc/user/project/img/project_settings_list.png
 %%WWWDIR%%/doc/user/project/img/protected_branches_choose_branch.png
+%%WWWDIR%%/doc/user/project/img/protected_branches_delete.png
 %%WWWDIR%%/doc/user/project/img/protected_branches_devs_can_push.png
 %%WWWDIR%%/doc/user/project/img/protected_branches_error_ui.png
 %%WWWDIR%%/doc/user/project/img/protected_branches_list.png
@@ -5988,7 +6197,6 @@
 %%WWWDIR%%/doc/user/project/integrations/bugzilla.md
 %%WWWDIR%%/doc/user/project/integrations/emails_on_push.md
 %%WWWDIR%%/doc/user/project/integrations/hipchat.md
-%%WWWDIR%%/doc/user/project/integrations/img/accessing_integrations.png
 %%WWWDIR%%/doc/user/project/integrations/img/emails_on_push_service.png
 %%WWWDIR%%/doc/user/project/integrations/img/jira_add_user_to_group.png
 %%WWWDIR%%/doc/user/project/integrations/img/jira_create_new_group.png
@@ -6028,6 +6236,7 @@
 %%WWWDIR%%/doc/user/project/integrations/img/services_templates_redmine_example.png
 %%WWWDIR%%/doc/user/project/integrations/img/slack_configuration.png
 %%WWWDIR%%/doc/user/project/integrations/img/slack_setup.png
+%%WWWDIR%%/doc/user/project/integrations/img/webhook_logs.png
 %%WWWDIR%%/doc/user/project/integrations/img/webhooks_ssl.png
 %%WWWDIR%%/doc/user/project/integrations/index.md
 %%WWWDIR%%/doc/user/project/integrations/irker.md
@@ -6070,7 +6279,6 @@
 %%WWWDIR%%/doc/user/project/issues/img/issue_tracker.png
 %%WWWDIR%%/doc/user/project/issues/img/issues_main_view.png
 %%WWWDIR%%/doc/user/project/issues/img/issues_main_view_numbered.jpg
-%%WWWDIR%%/doc/user/project/issues/img/issues_main_view_numbered.png
 %%WWWDIR%%/doc/user/project/issues/img/mention_in_issue.png
 %%WWWDIR%%/doc/user/project/issues/img/mention_in_merge_request.png
 %%WWWDIR%%/doc/user/project/issues/img/merge_request_closes_issue.png
@@ -6120,6 +6328,7 @@
 %%WWWDIR%%/doc/user/project/merge_requests/work_in_progress_merge_requests.md
 %%WWWDIR%%/doc/user/project/milestones/img/milestone_create.png
 %%WWWDIR%%/doc/user/project/milestones/img/milestone_group_create.png
+%%WWWDIR%%/doc/user/project/milestones/img/progress.png
 %%WWWDIR%%/doc/user/project/milestones/index.md
 %%WWWDIR%%/doc/user/project/new_ci_build_permissions_model.md
 %%WWWDIR%%/doc/user/project/pages/getting_started_part_four.md
@@ -6256,6 +6465,9 @@
 %%WWWDIR%%/doc/workflow/img/forking_workflow_fork_button.png
 %%WWWDIR%%/doc/workflow/img/forking_workflow_path_taken_error.png
 %%WWWDIR%%/doc/workflow/img/new_branch_from_issue.png
+%%WWWDIR%%/doc/workflow/img/notification_global_settings.png
+%%WWWDIR%%/doc/workflow/img/notification_group_settings.png
+%%WWWDIR%%/doc/workflow/img/notification_project_settings.png
 %%WWWDIR%%/doc/workflow/img/todo_list_item.png
 %%WWWDIR%%/doc/workflow/img/todos_add_todo_sidebar.png
 %%WWWDIR%%/doc/workflow/img/todos_icon.png
@@ -6293,7 +6505,6 @@
 %%WWWDIR%%/doc/workflow/milestones.md
 %%WWWDIR%%/doc/workflow/mr_inline_comments.png
 %%WWWDIR%%/doc/workflow/notifications.md
-%%WWWDIR%%/doc/workflow/notifications/settings.png
 %%WWWDIR%%/doc/workflow/production_branch.png
 %%WWWDIR%%/doc/workflow/project_features.md
 %%WWWDIR%%/doc/workflow/protected_branches.md
@@ -6323,7 +6534,6 @@
 %%WWWDIR%%/features/dashboard/event_filters.feature
 %%WWWDIR%%/features/dashboard/merge_requests.feature
 %%WWWDIR%%/features/dashboard/new_project.feature
-%%WWWDIR%%/features/dashboard/starred_projects.feature
 %%WWWDIR%%/features/dashboard/todos.feature
 %%WWWDIR%%/features/explore/groups.feature
 %%WWWDIR%%/features/explore/projects.feature
@@ -6354,7 +6564,6 @@
 %%WWWDIR%%/features/project/forked_merge_requests.feature
 %%WWWDIR%%/features/project/graph.feature
 %%WWWDIR%%/features/project/group_links.feature
-%%WWWDIR%%/features/project/hooks.feature
 %%WWWDIR%%/features/project/issues/award_emoji.feature
 %%WWWDIR%%/features/project/issues/issues.feature
 %%WWWDIR%%/features/project/issues/labels.feature
@@ -6413,7 +6622,6 @@
 %%WWWDIR%%/features/steps/project/fork.rb
 %%WWWDIR%%/features/steps/project/forked_merge_requests.rb
 %%WWWDIR%%/features/steps/project/graph.rb
-%%WWWDIR%%/features/steps/project/hooks.rb
 %%WWWDIR%%/features/steps/project/issues/award_emoji.rb
 %%WWWDIR%%/features/steps/project/issues/filter_labels.rb
 %%WWWDIR%%/features/steps/project/issues/issues.rb
@@ -6487,6 +6695,8 @@
 %%WWWDIR%%/lib/api/deployments.rb
 %%WWWDIR%%/lib/api/entities.rb
 %%WWWDIR%%/lib/api/environments.rb
+%%WWWDIR%%/lib/api/events.rb
+%%WWWDIR%%/lib/api/features.rb
 %%WWWDIR%%/lib/api/files.rb
 %%WWWDIR%%/lib/api/groups.rb
 %%WWWDIR%%/lib/api/helpers.rb
@@ -6510,6 +6720,7 @@
 %%WWWDIR%%/lib/api/notes.rb
 %%WWWDIR%%/lib/api/notification_settings.rb
 %%WWWDIR%%/lib/api/pagination_params.rb
+%%WWWDIR%%/lib/api/pipeline_schedules.rb
 %%WWWDIR%%/lib/api/pipelines.rb
 %%WWWDIR%%/lib/api/project_hooks.rb
 %%WWWDIR%%/lib/api/project_snippets.rb
@@ -6517,6 +6728,7 @@
 %%WWWDIR%%/lib/api/repositories.rb
 %%WWWDIR%%/lib/api/runner.rb
 %%WWWDIR%%/lib/api/runners.rb
+%%WWWDIR%%/lib/api/scope.rb
 %%WWWDIR%%/lib/api/services.rb
 %%WWWDIR%%/lib/api/session.rb
 %%WWWDIR%%/lib/api/settings.rb
@@ -6584,6 +6796,7 @@
 %%WWWDIR%%/lib/banzai/cross_project_reference.rb
 %%WWWDIR%%/lib/banzai/filter.rb
 %%WWWDIR%%/lib/banzai/filter/abstract_reference_filter.rb
+%%WWWDIR%%/lib/banzai/filter/ascii_doc_post_processing_filter.rb
 %%WWWDIR%%/lib/banzai/filter/autolink_filter.rb
 %%WWWDIR%%/lib/banzai/filter/blockquote_fence_filter.rb
 %%WWWDIR%%/lib/banzai/filter/commit_range_reference_filter.rb
@@ -6623,6 +6836,7 @@
 %%WWWDIR%%/lib/banzai/note_renderer.rb
 %%WWWDIR%%/lib/banzai/object_renderer.rb
 %%WWWDIR%%/lib/banzai/pipeline.rb
+%%WWWDIR%%/lib/banzai/pipeline/ascii_doc_pipeline.rb
 %%WWWDIR%%/lib/banzai/pipeline/atom_pipeline.rb
 %%WWWDIR%%/lib/banzai/pipeline/base_pipeline.rb
 %%WWWDIR%%/lib/banzai/pipeline/broadcast_message_pipeline.rb
@@ -6694,6 +6908,7 @@
 %%WWWDIR%%/lib/event_filter.rb
 %%WWWDIR%%/lib/expand_variables.rb
 %%WWWDIR%%/lib/extracts_path.rb
+%%WWWDIR%%/lib/feature.rb
 %%WWWDIR%%/lib/file_size_validator.rb
 %%WWWDIR%%/lib/file_streamer.rb
 %%WWWDIR%%/lib/generators/rails/post_deployment_migration/post_deployment_migration_generator.rb
@@ -6801,6 +7016,7 @@
 %%WWWDIR%%/lib/gitlab/ci/config/loader.rb
 %%WWWDIR%%/lib/gitlab/ci/cron_parser.rb
 %%WWWDIR%%/lib/gitlab/ci/pipeline_duration.rb
+%%WWWDIR%%/lib/gitlab/ci/stage/seed.rb
 %%WWWDIR%%/lib/gitlab/ci/status/build/action.rb
 %%WWWDIR%%/lib/gitlab/ci/status/build/cancelable.rb
 %%WWWDIR%%/lib/gitlab/ci/status/build/common.rb
@@ -6832,6 +7048,7 @@
 %%WWWDIR%%/lib/gitlab/ci/status/success_warning.rb
 %%WWWDIR%%/lib/gitlab/ci/trace.rb
 %%WWWDIR%%/lib/gitlab/ci/trace/stream.rb
+%%WWWDIR%%/lib/gitlab/ci_access.rb
 %%WWWDIR%%/lib/gitlab/closing_issue_extractor.rb
 %%WWWDIR%%/lib/gitlab/color_schemes.rb
 %%WWWDIR%%/lib/gitlab/config_helper.rb
@@ -6876,6 +7093,7 @@
 %%WWWDIR%%/lib/gitlab/data_builder/note.rb
 %%WWWDIR%%/lib/gitlab/data_builder/pipeline.rb
 %%WWWDIR%%/lib/gitlab/data_builder/push.rb
+%%WWWDIR%%/lib/gitlab/data_builder/repository.rb
 %%WWWDIR%%/lib/gitlab/database.rb
 %%WWWDIR%%/lib/gitlab/database/date_time.rb
 %%WWWDIR%%/lib/gitlab/database/median.rb
@@ -6886,6 +7104,21 @@
 %%WWWDIR%%/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
 %%WWWDIR%%/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb
 %%WWWDIR%%/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/base_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/cartfile_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/cocoapods.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/composer_json_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/gemfile_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/gemspec_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/godeps_json_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/json_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/method_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/package_json_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/podfile_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/podspec_json_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/podspec_linker.rb
+%%WWWDIR%%/lib/gitlab/dependency_linker/requirements_txt_linker.rb
 %%WWWDIR%%/lib/gitlab/devise_failure.rb
 %%WWWDIR%%/lib/gitlab/diff/diff_refs.rb
 %%WWWDIR%%/lib/gitlab/diff/file.rb
@@ -6895,6 +7128,7 @@
 %%WWWDIR%%/lib/gitlab/diff/file_collection/merge_request_diff.rb
 %%WWWDIR%%/lib/gitlab/diff/highlight.rb
 %%WWWDIR%%/lib/gitlab/diff/inline_diff.rb
+%%WWWDIR%%/lib/gitlab/diff/inline_diff_markdown_marker.rb
 %%WWWDIR%%/lib/gitlab/diff/inline_diff_marker.rb
 %%WWWDIR%%/lib/gitlab/diff/line.rb
 %%WWWDIR%%/lib/gitlab/diff/line_code.rb
@@ -6918,12 +7152,15 @@
 %%WWWDIR%%/lib/gitlab/email/receiver.rb
 %%WWWDIR%%/lib/gitlab/email/reply_parser.rb
 %%WWWDIR%%/lib/gitlab/emoji.rb
+%%WWWDIR%%/lib/gitlab/encoding_helper.rb
 %%WWWDIR%%/lib/gitlab/environment_logger.rb
 %%WWWDIR%%/lib/gitlab/etag_caching/middleware.rb
 %%WWWDIR%%/lib/gitlab/etag_caching/router.rb
 %%WWWDIR%%/lib/gitlab/etag_caching/store.rb
 %%WWWDIR%%/lib/gitlab/exclusive_lease.rb
+%%WWWDIR%%/lib/gitlab/fake_application_settings.rb
 %%WWWDIR%%/lib/gitlab/file_detector.rb
+%%WWWDIR%%/lib/gitlab/file_finder.rb
 %%WWWDIR%%/lib/gitlab/fogbugz_import/client.rb
 %%WWWDIR%%/lib/gitlab/fogbugz_import/importer.rb
 %%WWWDIR%%/lib/gitlab/fogbugz_import/project_creator.rb
@@ -6941,7 +7178,6 @@
 %%WWWDIR%%/lib/gitlab/git/compare.rb
 %%WWWDIR%%/lib/gitlab/git/diff.rb
 %%WWWDIR%%/lib/gitlab/git/diff_collection.rb
-%%WWWDIR%%/lib/gitlab/git/encoding_helper.rb
 %%WWWDIR%%/lib/gitlab/git/env.rb
 %%WWWDIR%%/lib/gitlab/git/hook.rb
 %%WWWDIR%%/lib/gitlab/git/index.rb
@@ -6954,13 +7190,14 @@
 %%WWWDIR%%/lib/gitlab/git/tree.rb
 %%WWWDIR%%/lib/gitlab/git/util.rb
 %%WWWDIR%%/lib/gitlab/git_access.rb
-%%WWWDIR%%/lib/gitlab/git_access_status.rb
 %%WWWDIR%%/lib/gitlab/git_access_wiki.rb
 %%WWWDIR%%/lib/gitlab/git_logger.rb
 %%WWWDIR%%/lib/gitlab/git_post_receive.rb
 %%WWWDIR%%/lib/gitlab/git_ref_validator.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/commit.rb
+%%WWWDIR%%/lib/gitlab/gitaly_client/diff.rb
+%%WWWDIR%%/lib/gitlab/gitaly_client/diff_stitcher.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/notifications.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/ref.rb
 %%WWWDIR%%/lib/gitlab/gitaly_client/util.rb
@@ -6989,10 +7226,12 @@
 %%WWWDIR%%/lib/gitlab/google_code_import/project_creator.rb
 %%WWWDIR%%/lib/gitlab/google_code_import/repository.rb
 %%WWWDIR%%/lib/gitlab/graphs/commits.rb
+%%WWWDIR%%/lib/gitlab/group_hierarchy.rb
 %%WWWDIR%%/lib/gitlab/health_checks/base_abstract_check.rb
 %%WWWDIR%%/lib/gitlab/health_checks/db_check.rb
 %%WWWDIR%%/lib/gitlab/health_checks/fs_shards_check.rb
 %%WWWDIR%%/lib/gitlab/health_checks/metric.rb
+%%WWWDIR%%/lib/gitlab/health_checks/prometheus_text_format.rb
 %%WWWDIR%%/lib/gitlab/health_checks/redis_check.rb
 %%WWWDIR%%/lib/gitlab/health_checks/result.rb
 %%WWWDIR%%/lib/gitlab/health_checks/simple_abstract_check.rb
@@ -7050,9 +7289,12 @@
 %%WWWDIR%%/lib/gitlab/markup_helper.rb
 %%WWWDIR%%/lib/gitlab/metrics.rb
 %%WWWDIR%%/lib/gitlab/metrics/delta.rb
+%%WWWDIR%%/lib/gitlab/metrics/influx_db.rb
 %%WWWDIR%%/lib/gitlab/metrics/instrumentation.rb
 %%WWWDIR%%/lib/gitlab/metrics/method_call.rb
 %%WWWDIR%%/lib/gitlab/metrics/metric.rb
+%%WWWDIR%%/lib/gitlab/metrics/null_metric.rb
+%%WWWDIR%%/lib/gitlab/metrics/prometheus.rb
 %%WWWDIR%%/lib/gitlab/metrics/rack_middleware.rb
 %%WWWDIR%%/lib/gitlab/metrics/sampler.rb
 %%WWWDIR%%/lib/gitlab/metrics/sidekiq_middleware.rb
@@ -7072,12 +7314,22 @@
 %%WWWDIR%%/lib/gitlab/o_auth/user.rb
 %%WWWDIR%%/lib/gitlab/optimistic_locking.rb
 %%WWWDIR%%/lib/gitlab/other_markup.rb
+%%WWWDIR%%/lib/gitlab/otp_key_rotator.rb
 %%WWWDIR%%/lib/gitlab/pages_transfer.rb
+%%WWWDIR%%/lib/gitlab/path_regex.rb
+%%WWWDIR%%/lib/gitlab/performance_bar.rb
+%%WWWDIR%%/lib/gitlab/performance_bar/peek_performance_bar_with_rack_body.rb
+%%WWWDIR%%/lib/gitlab/performance_bar/peek_query_tracker.rb
 %%WWWDIR%%/lib/gitlab/polling_interval.rb
 %%WWWDIR%%/lib/gitlab/popen.rb
+%%WWWDIR%%/lib/gitlab/project_authorizations/with_nested_groups.rb
+%%WWWDIR%%/lib/gitlab/project_authorizations/without_nested_groups.rb
 %%WWWDIR%%/lib/gitlab/project_search_results.rb
 %%WWWDIR%%/lib/gitlab/project_transfer.rb
-%%WWWDIR%%/lib/gitlab/prometheus.rb
+%%WWWDIR%%/lib/gitlab/prometheus/queries/base_query.rb
+%%WWWDIR%%/lib/gitlab/prometheus/queries/deployment_query.rb
+%%WWWDIR%%/lib/gitlab/prometheus/queries/environment_query.rb
+%%WWWDIR%%/lib/gitlab/prometheus_client.rb
 %%WWWDIR%%/lib/gitlab/protocol_access.rb
 %%WWWDIR%%/lib/gitlab/recaptcha.rb
 %%WWWDIR%%/lib/gitlab/redis.rb
@@ -7090,6 +7342,7 @@
 %%WWWDIR%%/lib/gitlab/request_profiler/middleware.rb
 %%WWWDIR%%/lib/gitlab/request_profiler/profile.rb
 %%WWWDIR%%/lib/gitlab/route_map.rb
+%%WWWDIR%%/lib/gitlab/routes/legacy_builds.rb
 %%WWWDIR%%/lib/gitlab/routing.rb
 %%WWWDIR%%/lib/gitlab/saml/auth_hash.rb
 %%WWWDIR%%/lib/gitlab/saml/config.rb
@@ -7124,7 +7377,10 @@
 %%WWWDIR%%/lib/gitlab/slash_commands/dsl.rb
 %%WWWDIR%%/lib/gitlab/slash_commands/extractor.rb
 %%WWWDIR%%/lib/gitlab/snippet_search_results.rb
+%%WWWDIR%%/lib/gitlab/sql/recursive_cte.rb
 %%WWWDIR%%/lib/gitlab/sql/union.rb
+%%WWWDIR%%/lib/gitlab/string_range_marker.rb
+%%WWWDIR%%/lib/gitlab/string_regex_marker.rb
 %%WWWDIR%%/lib/gitlab/template/base_template.rb
 %%WWWDIR%%/lib/gitlab/template/dockerfile_template.rb
 %%WWWDIR%%/lib/gitlab/template/finders/base_template_finder.rb
@@ -7167,6 +7423,7 @@
 %%WWWDIR%%/lib/microsoft_teams/notifier.rb
 %%WWWDIR%%/lib/omni_auth/request_forgery_protection.rb
 %%WWWDIR%%/lib/omni_auth/strategies/bitbucket.rb
+%%WWWDIR%%/lib/peek/rblineprof/custom_controller_helpers.rb
 %%WWWDIR%%/lib/repository_cache.rb
 %%WWWDIR%%/lib/rouge/formatters/html_gitlab.rb
 %%WWWDIR%%/lib/rouge/lexers/math.rb
@@ -7179,6 +7436,28 @@
 %%WWWDIR%%/lib/support/nginx/gitlab-pages
 %%WWWDIR%%/lib/support/nginx/gitlab-pages-ssl
 %%WWWDIR%%/lib/support/nginx/registry-ssl
+%%WWWDIR%%/lib/system_check.rb
+%%WWWDIR%%/lib/system_check/app/active_users_check.rb
+%%WWWDIR%%/lib/system_check/app/database_config_exists_check.rb
+%%WWWDIR%%/lib/system_check/app/git_config_check.rb
+%%WWWDIR%%/lib/system_check/app/git_version_check.rb
+%%WWWDIR%%/lib/system_check/app/gitlab_config_exists_check.rb
+%%WWWDIR%%/lib/system_check/app/gitlab_config_up_to_date_check.rb
+%%WWWDIR%%/lib/system_check/app/init_script_exists_check.rb
+%%WWWDIR%%/lib/system_check/app/init_script_up_to_date_check.rb
+%%WWWDIR%%/lib/system_check/app/log_writable_check.rb
+%%WWWDIR%%/lib/system_check/app/migrations_are_up_check.rb
+%%WWWDIR%%/lib/system_check/app/orphaned_group_members_check.rb
+%%WWWDIR%%/lib/system_check/app/projects_have_namespace_check.rb
+%%WWWDIR%%/lib/system_check/app/redis_version_check.rb
+%%WWWDIR%%/lib/system_check/app/ruby_version_check.rb
+%%WWWDIR%%/lib/system_check/app/tmp_writable_check.rb
+%%WWWDIR%%/lib/system_check/app/uploads_directory_exists_check.rb
+%%WWWDIR%%/lib/system_check/app/uploads_path_permission_check.rb
+%%WWWDIR%%/lib/system_check/app/uploads_path_tmp_permission_check.rb
+%%WWWDIR%%/lib/system_check/base_check.rb
+%%WWWDIR%%/lib/system_check/helpers.rb
+%%WWWDIR%%/lib/system_check/simple_executor.rb
 %%WWWDIR%%/lib/tasks/brakeman.rake
 %%WWWDIR%%/lib/tasks/cache.rake
 %%WWWDIR%%/lib/tasks/ci/cleanup.rake
@@ -7237,13 +7516,23 @@
 %%WWWDIR%%/lib/unfold_form.rb
 %%WWWDIR%%/lib/uploaded_file.rb
 %%WWWDIR%%/lib/version_check.rb
-%%WWWDIR%%/locale/de/gitlab.po
-%%WWWDIR%%/locale/de/gitlab.po.time_stamp
-%%WWWDIR%%/locale/en/gitlab.po
-%%WWWDIR%%/locale/en/gitlab.po.time_stamp
-%%WWWDIR%%/locale/es/gitlab.po
-%%WWWDIR%%/locale/es/gitlab.po.time_stamp
-%%WWWDIR%%/locale/gitlab.pot
+@(git,,) %%WWWDIR%%/locale/bg/gitlab.po
+@(git,,) %%WWWDIR%%/locale/bg/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/de/gitlab.po
+@(git,,) %%WWWDIR%%/locale/de/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/en/gitlab.po
+@(git,,) %%WWWDIR%%/locale/en/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/es/gitlab.po
+@(git,,) %%WWWDIR%%/locale/es/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/gitlab.pot
+@(git,,) %%WWWDIR%%/locale/pt_BR/gitlab.po
+@(git,,) %%WWWDIR%%/locale/pt_BR/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/zh_CN/gitlab.po
+@(git,,) %%WWWDIR%%/locale/zh_CN/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/zh_HK/gitlab.po
+@(git,,) %%WWWDIR%%/locale/zh_HK/gitlab.po.time_stamp
+@(git,,) %%WWWDIR%%/locale/zh_TW/gitlab.po
+@(git,,) %%WWWDIR%%/locale/zh_TW/gitlab.po.time_stamp
 %%WWWDIR%%/package.json
 %%WWWDIR%%/public/404.html
 %%WWWDIR%%/public/422.html
@@ -7290,6 +7579,7 @@
 %%WWWDIR%%/qa/spec/runtime/release_spec.rb
 %%WWWDIR%%/qa/spec/scenario/actable_spec.rb
 %%WWWDIR%%/qa/spec/spec_helper.rb
+%%WWWDIR%%/rubocop/cop/activerecord_serialize.rb
 %%WWWDIR%%/rubocop/cop/custom_error_class.rb
 %%WWWDIR%%/rubocop/cop/gem_fetcher.rb
 %%WWWDIR%%/rubocop/cop/migration/add_column.rb
@@ -7300,7 +7590,11 @@
 %%WWWDIR%%/rubocop/cop/migration/remove_concurrent_index.rb
 %%WWWDIR%%/rubocop/cop/migration/remove_index.rb
 %%WWWDIR%%/rubocop/cop/migration/reversible_add_column_with_default.rb
+%%WWWDIR%%/rubocop/cop/migration/update_column_in_batches.rb
+%%WWWDIR%%/rubocop/cop/polymorphic_associations.rb
+%%WWWDIR%%/rubocop/cop/redirect_with_status.rb
 %%WWWDIR%%/rubocop/migration_helpers.rb
+%%WWWDIR%%/rubocop/model_helpers.rb
 %%WWWDIR%%/rubocop/rubocop.rb
 %%WWWDIR%%/scripts/lint-doc.sh
 %%WWWDIR%%/scripts/merge-reports
@@ -7308,6 +7602,7 @@
 %%WWWDIR%%/scripts/prepare_build.sh
 %%WWWDIR%%/scripts/static-analysis
 %%WWWDIR%%/scripts/sync-reports
+%%WWWDIR%%/scripts/trigger-build
 %%WWWDIR%%/scripts/utils.sh
 %%WWWDIR%%/spec/bin/changelog_spec.rb
 %%WWWDIR%%/spec/config/mail_room_spec.rb
@@ -7315,6 +7610,7 @@
 %%WWWDIR%%/spec/controllers/admin/application_settings_controller_spec.rb
 %%WWWDIR%%/spec/controllers/admin/applications_controller_spec.rb
 %%WWWDIR%%/spec/controllers/admin/groups_controller_spec.rb
+%%WWWDIR%%/spec/controllers/admin/hooks_controller_spec.rb
 %%WWWDIR%%/spec/controllers/admin/identities_controller_spec.rb
 %%WWWDIR%%/spec/controllers/admin/impersonations_controller_spec.rb
 %%WWWDIR%%/spec/controllers/admin/projects_controller_spec.rb
@@ -7342,6 +7638,7 @@
 %%WWWDIR%%/spec/controllers/import/gitlab_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/google_code_controller_spec.rb
 %%WWWDIR%%/spec/controllers/invites_controller_spec.rb
+%%WWWDIR%%/spec/controllers/metrics_controller_spec.rb
 %%WWWDIR%%/spec/controllers/notification_settings_controller_spec.rb
 %%WWWDIR%%/spec/controllers/oauth/applications_controller_spec.rb
 %%WWWDIR%%/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -7352,6 +7649,7 @@
 %%WWWDIR%%/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
 %%WWWDIR%%/spec/controllers/profiles/preferences_controller_spec.rb
 %%WWWDIR%%/spec/controllers/profiles/two_factor_auths_controller_spec.rb
+%%WWWDIR%%/spec/controllers/profiles_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/artifacts_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/avatars_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/blame_controller_spec.rb
@@ -7360,7 +7658,6 @@
 %%WWWDIR%%/spec/controllers/projects/boards/lists_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/boards_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/branches_controller_spec.rb
-%%WWWDIR%%/spec/controllers/projects/builds_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/commit_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/commits_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/compare_controller_spec.rb
@@ -7375,6 +7672,7 @@
 %%WWWDIR%%/spec/controllers/projects/group_links_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/imports_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/issues_controller_spec.rb
+%%WWWDIR%%/spec/controllers/projects/jobs_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/labels_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/mattermosts_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -7416,9 +7714,10 @@
 %%WWWDIR%%/spec/controllers/snippets_controller_spec.rb
 %%WWWDIR%%/spec/controllers/uploads_controller_spec.rb
 %%WWWDIR%%/spec/controllers/users_controller_spec.rb
-%%WWWDIR%%/spec/db/production/settings.rb
+%%WWWDIR%%/spec/db/production/settings_spec.rb
 %%WWWDIR%%/spec/factories/abuse_reports.rb
 %%WWWDIR%%/spec/factories/appearances.rb
+%%WWWDIR%%/spec/factories/application_settings.rb
 %%WWWDIR%%/spec/factories/award_emoji.rb
 %%WWWDIR%%/spec/factories/boards.rb
 %%WWWDIR%%/spec/factories/broadcast_messages.rb
@@ -7436,12 +7735,13 @@
 %%WWWDIR%%/spec/factories/commit_statuses.rb
 %%WWWDIR%%/spec/factories/commits.rb
 %%WWWDIR%%/spec/factories/container_repositories.rb
+%%WWWDIR%%/spec/factories/conversational_development_index_metrics.rb
 %%WWWDIR%%/spec/factories/deploy_keys_projects.rb
 %%WWWDIR%%/spec/factories/deployments.rb
 %%WWWDIR%%/spec/factories/emails.rb
 %%WWWDIR%%/spec/factories/environments.rb
 %%WWWDIR%%/spec/factories/events.rb
-%%WWWDIR%%/spec/factories/file_uploader.rb
+%%WWWDIR%%/spec/factories/file_uploaders.rb
 %%WWWDIR%%/spec/factories/forked_project_links.rb
 %%WWWDIR%%/spec/factories/group_members.rb
 %%WWWDIR%%/spec/factories/groups.rb
@@ -7492,6 +7792,7 @@
 %%WWWDIR%%/spec/factories/uploads.rb
 %%WWWDIR%%/spec/factories/user_agent_details.rb
 %%WWWDIR%%/spec/factories/users.rb
+%%WWWDIR%%/spec/factories/web_hook_log.rb
 %%WWWDIR%%/spec/factories/wiki_directories.rb
 %%WWWDIR%%/spec/factories/wiki_pages.rb
 %%WWWDIR%%/spec/factories_spec.rb
@@ -7504,11 +7805,13 @@
 %%WWWDIR%%/spec/features/admin/admin_browses_logs_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_builds_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_cohorts_spec.rb
+%%WWWDIR%%/spec/features/admin/admin_conversational_development_index_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_deploy_keys_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_disables_git_access_protocol_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_disables_two_factor_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_groups_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_health_check_spec.rb
+%%WWWDIR%%/spec/features/admin/admin_hook_logs_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_hooks_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_labels_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_manage_applications_spec.rb
@@ -7550,6 +7853,7 @@
 %%WWWDIR%%/spec/features/dashboard/issues_spec.rb
 %%WWWDIR%%/spec/features/dashboard/label_filter_spec.rb
 %%WWWDIR%%/spec/features/dashboard/merge_requests_spec.rb
+%%WWWDIR%%/spec/features/dashboard/milestone_filter_spec.rb
 %%WWWDIR%%/spec/features/dashboard/project_member_activity_index_spec.rb
 %%WWWDIR%%/spec/features/dashboard/projects_spec.rb
 %%WWWDIR%%/spec/features/dashboard/shortcuts_spec.rb
@@ -7563,6 +7867,7 @@
 %%WWWDIR%%/spec/features/discussion_comments/snippets_spec.rb
 %%WWWDIR%%/spec/features/expand_collapse_diffs_spec.rb
 %%WWWDIR%%/spec/features/explore/groups_list_spec.rb
+%%WWWDIR%%/spec/features/explore/new_menu_spec.rb
 %%WWWDIR%%/spec/features/gitlab_flavored_markdown_spec.rb
 %%WWWDIR%%/spec/features/global_search_spec.rb
 %%WWWDIR%%/spec/features/groups/activity_spec.rb
@@ -7668,18 +7973,19 @@
 %%WWWDIR%%/spec/features/profiles/preferences_spec.rb
 %%WWWDIR%%/spec/features/profiles/user_changes_notified_of_own_activity_spec.rb
 %%WWWDIR%%/spec/features/projects/activity/rss_spec.rb
+%%WWWDIR%%/spec/features/projects/artifacts/browse_spec.rb
+%%WWWDIR%%/spec/features/projects/artifacts/download_spec.rb
 %%WWWDIR%%/spec/features/projects/artifacts/file_spec.rb
+%%WWWDIR%%/spec/features/projects/artifacts/raw_spec.rb
 %%WWWDIR%%/spec/features/projects/badges/coverage_spec.rb
 %%WWWDIR%%/spec/features/projects/badges/list_spec.rb
 %%WWWDIR%%/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
 %%WWWDIR%%/spec/features/projects/blobs/blob_show_spec.rb
 %%WWWDIR%%/spec/features/projects/blobs/edit_spec.rb
 %%WWWDIR%%/spec/features/projects/blobs/shortcuts_blob_spec.rb
-%%WWWDIR%%/spec/features/projects/blobs/user_create_spec.rb
 %%WWWDIR%%/spec/features/projects/branches/download_buttons_spec.rb
 %%WWWDIR%%/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
 %%WWWDIR%%/spec/features/projects/branches_spec.rb
-%%WWWDIR%%/spec/features/projects/builds_spec.rb
 %%WWWDIR%%/spec/features/projects/commit/builds_spec.rb
 %%WWWDIR%%/spec/features/projects/commit/cherry_pick_spec.rb
 %%WWWDIR%%/spec/features/projects/commit/mini_pipeline_graph_spec.rb
@@ -7717,6 +8023,7 @@
 %%WWWDIR%%/spec/features/projects/issuable_templates_spec.rb
 %%WWWDIR%%/spec/features/projects/issues/list_spec.rb
 %%WWWDIR%%/spec/features/projects/issues/rss_spec.rb
+%%WWWDIR%%/spec/features/projects/jobs_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/subscription_spec.rb
 %%WWWDIR%%/spec/features/projects/labels/update_prioritization_spec.rb
@@ -7741,6 +8048,7 @@
 %%WWWDIR%%/spec/features/projects/merge_requests/list_spec.rb
 %%WWWDIR%%/spec/features/projects/milestones/milestone_spec.rb
 %%WWWDIR%%/spec/features/projects/milestones/milestones_sorting_spec.rb
+%%WWWDIR%%/spec/features/projects/milestones/new_spec.rb
 %%WWWDIR%%/spec/features/projects/new_project_spec.rb
 %%WWWDIR%%/spec/features/projects/pages_spec.rb
 %%WWWDIR%%/spec/features/projects/pipeline_schedules_spec.rb
@@ -7748,14 +8056,17 @@
 %%WWWDIR%%/spec/features/projects/pipelines/pipelines_spec.rb
 %%WWWDIR%%/spec/features/projects/project_settings_spec.rb
 %%WWWDIR%%/spec/features/projects/ref_switcher_spec.rb
+%%WWWDIR%%/spec/features/projects/services/jira_service_spec.rb
 %%WWWDIR%%/spec/features/projects/services/mattermost_slash_command_spec.rb
 %%WWWDIR%%/spec/features/projects/services/slack_service_spec.rb
 %%WWWDIR%%/spec/features/projects/services/slack_slash_command_spec.rb
 %%WWWDIR%%/spec/features/projects/settings/integration_settings_spec.rb
 %%WWWDIR%%/spec/features/projects/settings/merge_requests_settings_spec.rb
 %%WWWDIR%%/spec/features/projects/settings/pipelines_settings_spec.rb
+%%WWWDIR%%/spec/features/projects/settings/repository_settings_spec.rb
 %%WWWDIR%%/spec/features/projects/settings/visibility_settings_spec.rb
 %%WWWDIR%%/spec/features/projects/shortcuts_spec.rb
+%%WWWDIR%%/spec/features/projects/snippets/create_snippet_spec.rb
 %%WWWDIR%%/spec/features/projects/snippets/show_spec.rb
 %%WWWDIR%%/spec/features/projects/snippets_spec.rb
 %%WWWDIR%%/spec/features/projects/sub_group_issuables_spec.rb
@@ -7771,11 +8082,13 @@
 %%WWWDIR%%/spec/features/projects/wiki/user_views_project_wiki_page_spec.rb
 %%WWWDIR%%/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
 %%WWWDIR%%/spec/features/projects_spec.rb
-%%WWWDIR%%/spec/features/protected_branches/access_control_ce_spec.rb
 %%WWWDIR%%/spec/features/protected_branches_spec.rb
-%%WWWDIR%%/spec/features/protected_tags/access_control_ce_spec.rb
 %%WWWDIR%%/spec/features/protected_tags_spec.rb
 %%WWWDIR%%/spec/features/raven_js_spec.rb
+%%WWWDIR%%/spec/features/reportable_note/commit_spec.rb
+%%WWWDIR%%/spec/features/reportable_note/issue_spec.rb
+%%WWWDIR%%/spec/features/reportable_note/merge_request_spec.rb
+%%WWWDIR%%/spec/features/reportable_note/snippets_spec.rb
 %%WWWDIR%%/spec/features/runners_spec.rb
 %%WWWDIR%%/spec/features/search_spec.rb
 %%WWWDIR%%/spec/features/security/admin_access_spec.rb
@@ -7792,6 +8105,7 @@
 %%WWWDIR%%/spec/features/security/project/snippet/public_access_spec.rb
 %%WWWDIR%%/spec/features/signup_spec.rb
 %%WWWDIR%%/spec/features/snippets/create_snippet_spec.rb
+%%WWWDIR%%/spec/features/snippets/edit_snippet_spec.rb
 %%WWWDIR%%/spec/features/snippets/explore_spec.rb
 %%WWWDIR%%/spec/features/snippets/internal_snippet_spec.rb
 %%WWWDIR%%/spec/features/snippets/notes_on_personal_snippets_spec.rb
@@ -7816,6 +8130,7 @@
 %%WWWDIR%%/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
 %%WWWDIR%%/spec/features/uploads/user_uploads_file_to_note_spec.rb
 %%WWWDIR%%/spec/features/user_callout_spec.rb
+%%WWWDIR%%/spec/features/user_can_display_performance_bar_spec.rb
 %%WWWDIR%%/spec/features/users/projects_spec.rb
 %%WWWDIR%%/spec/features/users/rss_spec.rb
 %%WWWDIR%%/spec/features/users/snippets_spec.rb
@@ -7825,6 +8140,7 @@
 %%WWWDIR%%/spec/finders/branches_finder_spec.rb
 %%WWWDIR%%/spec/finders/contributed_projects_finder_spec.rb
 %%WWWDIR%%/spec/finders/environments_finder_spec.rb
+%%WWWDIR%%/spec/finders/events_finder_spec.rb
 %%WWWDIR%%/spec/finders/group_members_finder_spec.rb
 %%WWWDIR%%/spec/finders/group_projects_finder_spec.rb
 %%WWWDIR%%/spec/finders/groups_finder_spec.rb
@@ -7843,6 +8159,7 @@
 %%WWWDIR%%/spec/finders/snippets_finder_spec.rb
 %%WWWDIR%%/spec/finders/tags_finder_spec.rb
 %%WWWDIR%%/spec/finders/todos_finder_spec.rb
+%%WWWDIR%%/spec/finders/users_finder_spec.rb
 %%WWWDIR%%/spec/fixtures/GoogleCodeProjectHosting.json
 %%WWWDIR%%/spec/fixtures/api/schemas/board.json
 %%WWWDIR%%/spec/fixtures/api/schemas/boards.json
@@ -7857,10 +8174,13 @@
 %%WWWDIR%%/spec/fixtures/api/schemas/lists.json
 %%WWWDIR%%/spec/fixtures/api/schemas/merge_request.json
 %%WWWDIR%%/spec/fixtures/api/schemas/pipeline.json
+%%WWWDIR%%/spec/fixtures/api/schemas/pipeline_schedule.json
+%%WWWDIR%%/spec/fixtures/api/schemas/pipeline_schedules.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v3/issues.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v3/merge_requests.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/issues.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/merge_requests.json
+%%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/user/admin.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/user/login.json
 %%WWWDIR%%/spec/fixtures/api/schemas/public_api/v4/user/public.json
 %%WWWDIR%%/spec/fixtures/banana_sample.gif
@@ -7954,6 +8274,7 @@
 %%WWWDIR%%/spec/helpers/notifications_helper_spec.rb
 %%WWWDIR%%/spec/helpers/page_layout_helper_spec.rb
 %%WWWDIR%%/spec/helpers/preferences_helper_spec.rb
+%%WWWDIR%%/spec/helpers/profiles_helper_spec.rb
 %%WWWDIR%%/spec/helpers/projects_helper_spec.rb
 %%WWWDIR%%/spec/helpers/rss_helper_spec.rb
 %%WWWDIR%%/spec/helpers/runners_helper_spec.rb
@@ -7979,6 +8300,7 @@
 %%WWWDIR%%/spec/javascripts/abuse_reports_spec.js
 %%WWWDIR%%/spec/javascripts/activities_spec.js
 %%WWWDIR%%/spec/javascripts/ajax_loading_spinner_spec.js
+%%WWWDIR%%/spec/javascripts/api_spec.js
 %%WWWDIR%%/spec/javascripts/autosave_spec.js
 %%WWWDIR%%/spec/javascripts/awards_handler_spec.js
 %%WWWDIR%%/spec/javascripts/behaviors/autosize_spec.js
@@ -7987,19 +8309,19 @@
 %%WWWDIR%%/spec/javascripts/behaviors/quick_submit_spec.js
 %%WWWDIR%%/spec/javascripts/behaviors/requires_input_spec.js
 %%WWWDIR%%/spec/javascripts/blob/3d_viewer/mesh_object_spec.js
+%%WWWDIR%%/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js
 %%WWWDIR%%/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
 %%WWWDIR%%/spec/javascripts/blob/blob_fork_suggestion_spec.js
-%%WWWDIR%%/spec/javascripts/blob/create_branch_dropdown_spec.js
 %%WWWDIR%%/spec/javascripts/blob/notebook/index_spec.js
 %%WWWDIR%%/spec/javascripts/blob/pdf/index_spec.js
 %%WWWDIR%%/spec/javascripts/blob/sketch/index_spec.js
-%%WWWDIR%%/spec/javascripts/blob/target_branch_dropdown_spec.js
 %%WWWDIR%%/spec/javascripts/blob/viewer/index_spec.js
 %%WWWDIR%%/spec/javascripts/boards/board_blank_state_spec.js
 %%WWWDIR%%/spec/javascripts/boards/board_card_spec.js
 %%WWWDIR%%/spec/javascripts/boards/board_list_spec.js
 %%WWWDIR%%/spec/javascripts/boards/board_new_issue_spec.js
 %%WWWDIR%%/spec/javascripts/boards/boards_store_spec.js
+%%WWWDIR%%/spec/javascripts/boards/components/board_spec.js
 %%WWWDIR%%/spec/javascripts/boards/issue_card_spec.js
 %%WWWDIR%%/spec/javascripts/boards/issue_spec.js
 %%WWWDIR%%/spec/javascripts/boards/list_spec.js
@@ -8010,9 +8332,9 @@
 %%WWWDIR%%/spec/javascripts/build_spec.js
 %%WWWDIR%%/spec/javascripts/collapsed_sidebar_todo_spec.js
 %%WWWDIR%%/spec/javascripts/comment_type_toggle_spec.js
-%%WWWDIR%%/spec/javascripts/commit/pipelines/mock_data.js
 %%WWWDIR%%/spec/javascripts/commit/pipelines/pipelines_spec.js
 %%WWWDIR%%/spec/javascripts/commits_spec.js
+%%WWWDIR%%/spec/javascripts/copy_as_gfm_spec.js
 %%WWWDIR%%/spec/javascripts/cycle_analytics/limit_warning_component_spec.js
 %%WWWDIR%%/spec/javascripts/datetime_utility_spec.js
 %%WWWDIR%%/spec/javascripts/deploy_keys/components/action_btn_spec.js
@@ -8023,6 +8345,7 @@
 %%WWWDIR%%/spec/javascripts/droplab/constants_spec.js
 %%WWWDIR%%/spec/javascripts/droplab/drop_down_spec.js
 %%WWWDIR%%/spec/javascripts/droplab/hook_spec.js
+%%WWWDIR%%/spec/javascripts/droplab/plugins/ajax_filter_spec.js
 %%WWWDIR%%/spec/javascripts/droplab/plugins/input_setter_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_actions_spec.js
 %%WWWDIR%%/spec/javascripts/environments/environment_external_url_spec.js
@@ -8051,9 +8374,11 @@
 %%WWWDIR%%/spec/javascripts/filtered_search/stores/recent_searches_store_spec.js
 %%WWWDIR%%/spec/javascripts/fixtures/abuse_reports.rb
 %%WWWDIR%%/spec/javascripts/fixtures/ajax_loading_spinner.html.haml
+%%WWWDIR%%/spec/javascripts/fixtures/balsamiq.rb
+%%WWWDIR%%/spec/javascripts/fixtures/balsamiq_viewer.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/blob.rb
+%%WWWDIR%%/spec/javascripts/fixtures/boards.rb
 %%WWWDIR%%/spec/javascripts/fixtures/branches.rb
-%%WWWDIR%%/spec/javascripts/fixtures/builds.rb
 %%WWWDIR%%/spec/javascripts/fixtures/dashboard.rb
 %%WWWDIR%%/spec/javascripts/fixtures/deploy_keys.rb
 %%WWWDIR%%/spec/javascripts/fixtures/environments.rb
@@ -8068,6 +8393,7 @@
 %%WWWDIR%%/spec/javascripts/fixtures/issuable_filter.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/issue_sidebar_label.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/issues.rb
+%%WWWDIR%%/spec/javascripts/fixtures/jobs.rb
 %%WWWDIR%%/spec/javascripts/fixtures/labels.rb
 %%WWWDIR%%/spec/javascripts/fixtures/line_highlighter.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/linked_tabs.html.haml
@@ -8079,16 +8405,16 @@
 %%WWWDIR%%/spec/javascripts/fixtures/pdf_viewer.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/pipeline_graph.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/pipelines.html.haml
+%%WWWDIR%%/spec/javascripts/fixtures/pipelines.rb
 %%WWWDIR%%/spec/javascripts/fixtures/pipelines_table.html.haml
-%%WWWDIR%%/spec/javascripts/fixtures/project_branches.json
 %%WWWDIR%%/spec/javascripts/fixtures/projects.json
 %%WWWDIR%%/spec/javascripts/fixtures/projects.rb
 %%WWWDIR%%/spec/javascripts/fixtures/raw.rb
 %%WWWDIR%%/spec/javascripts/fixtures/search_autocomplete.html.haml
+%%WWWDIR%%/spec/javascripts/fixtures/services.rb
 %%WWWDIR%%/spec/javascripts/fixtures/signin_tabs.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/sketch_viewer.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/static_fixtures.rb
-%%WWWDIR%%/spec/javascripts/fixtures/target_branch_dropdown.html.haml
 %%WWWDIR%%/spec/javascripts/fixtures/todos.rb
 %%WWWDIR%%/spec/javascripts/fixtures/u2f.rb
 %%WWWDIR%%/spec/javascripts/gfm_auto_complete_spec.js
@@ -8098,26 +8424,43 @@
 %%WWWDIR%%/spec/javascripts/gl_form_spec.js
 %%WWWDIR%%/spec/javascripts/graphs/stat_graph_contributors_graph_spec.js
 %%WWWDIR%%/spec/javascripts/graphs/stat_graph_contributors_util_spec.js
+%%WWWDIR%%/spec/javascripts/groups/group_item_spec.js
+%%WWWDIR%%/spec/javascripts/groups/groups_spec.js
+%%WWWDIR%%/spec/javascripts/groups/mock_data.js
 %%WWWDIR%%/spec/javascripts/header_spec.js
 %%WWWDIR%%/spec/javascripts/helpers/class_spec_helper.js
 %%WWWDIR%%/spec/javascripts/helpers/class_spec_helper_spec.js
 %%WWWDIR%%/spec/javascripts/helpers/filtered_search_spec_helper.js
 %%WWWDIR%%/spec/javascripts/helpers/user_mock_data_helper.js
+%%WWWDIR%%/spec/javascripts/integrations/integration_settings_form_spec.js
 %%WWWDIR%%/spec/javascripts/issuable_spec.js
 %%WWWDIR%%/spec/javascripts/issuable_time_tracker_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/app_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/description_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/edit_actions_spec.js
 %%WWWDIR%%/spec/javascripts/issue_show/components/edited_spec.js
-%%WWWDIR%%/spec/javascripts/issue_show/issue_title_description_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/fields/description_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/fields/description_template_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/fields/project_move_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/fields/title_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/form_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/components/title_spec.js
+%%WWWDIR%%/spec/javascripts/issue_show/helpers.js
 %%WWWDIR%%/spec/javascripts/issue_show/mock_data.js
 %%WWWDIR%%/spec/javascripts/issue_spec.js
 %%WWWDIR%%/spec/javascripts/labels_issue_sidebar_spec.js
 %%WWWDIR%%/spec/javascripts/landing_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/accessor_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/ajax_cache_spec.js
+%%WWWDIR%%/spec/javascripts/lib/utils/cache_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/common_utils_spec.js
+%%WWWDIR%%/spec/javascripts/lib/utils/dom_utils_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/number_utility_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/poll_spec.js
 %%WWWDIR%%/spec/javascripts/lib/utils/text_utility_spec.js
+%%WWWDIR%%/spec/javascripts/lib/utils/users_cache_spec.js
 %%WWWDIR%%/spec/javascripts/line_highlighter_spec.js
+%%WWWDIR%%/spec/javascripts/merge_request_notes_spec.js
 %%WWWDIR%%/spec/javascripts/merge_request_spec.js
 %%WWWDIR%%/spec/javascripts/merge_request_tabs_spec.js
 %%WWWDIR%%/spec/javascripts/mini_pipeline_graph_dropdown_spec.js
@@ -8147,8 +8490,10 @@
 %%WWWDIR%%/spec/javascripts/pipelines/graph/job_name_component_spec.js
 %%WWWDIR%%/spec/javascripts/pipelines/graph/mock_data.js
 %%WWWDIR%%/spec/javascripts/pipelines/graph/stage_column_component_spec.js
-%%WWWDIR%%/spec/javascripts/pipelines/mock_data.js
+%%WWWDIR%%/spec/javascripts/pipelines/header_component_spec.js
 %%WWWDIR%%/spec/javascripts/pipelines/nav_controls_spec.js
+%%WWWDIR%%/spec/javascripts/pipelines/pipeline_details_mediator_spec.js
+%%WWWDIR%%/spec/javascripts/pipelines/pipeline_store_spec.js
 %%WWWDIR%%/spec/javascripts/pipelines/pipeline_url_spec.js
 %%WWWDIR%%/spec/javascripts/pipelines/pipelines_actions_spec.js
 %%WWWDIR%%/spec/javascripts/pipelines/pipelines_artifacts_spec.js
@@ -8170,7 +8515,6 @@
 %%WWWDIR%%/spec/javascripts/sidebar/assignees_spec.js
 %%WWWDIR%%/spec/javascripts/sidebar/mock_data.js
 %%WWWDIR%%/spec/javascripts/sidebar/sidebar_assignees_spec.js
-%%WWWDIR%%/spec/javascripts/sidebar/sidebar_bundle_spec.js
 %%WWWDIR%%/spec/javascripts/sidebar/sidebar_mediator_spec.js
 %%WWWDIR%%/spec/javascripts/sidebar/sidebar_service_spec.js
 %%WWWDIR%%/spec/javascripts/sidebar/sidebar_store_spec.js
@@ -8221,17 +8565,26 @@
 %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_badge_link_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/ci_icon_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/commit_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/header_ci_component_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/loading_icon_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/markdown/field_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/markdown/header_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/memory_graph_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/mock_data.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/pipelines_table_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/components/table_pagination_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/time_ago_tooltip_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar_image_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar_link_spec.js
+%%WWWDIR%%/spec/javascripts/vue_shared/components/user_avatar_svg_spec.js
 %%WWWDIR%%/spec/javascripts/vue_shared/translate_spec.js
 %%WWWDIR%%/spec/javascripts/zen_mode_spec.js
 %%WWWDIR%%/spec/lib/additional_email_headers_interceptor_spec.rb
 %%WWWDIR%%/spec/lib/api/helpers/pagination_spec.rb
 %%WWWDIR%%/spec/lib/banzai/cross_project_reference_spec.rb
 %%WWWDIR%%/spec/lib/banzai/filter/abstract_reference_filter_spec.rb
+%%WWWDIR%%/spec/lib/banzai/filter/ascii_doc_post_processing_filter_spec.rb
 %%WWWDIR%%/spec/lib/banzai/filter/autolink_filter_spec.rb
 %%WWWDIR%%/spec/lib/banzai/filter/blockquote_fence_filter_spec.rb
 %%WWWDIR%%/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
@@ -8302,6 +8655,7 @@
 %%WWWDIR%%/spec/lib/constraints/project_url_constrainer_spec.rb
 %%WWWDIR%%/spec/lib/constraints/user_url_constrainer_spec.rb
 %%WWWDIR%%/spec/lib/container_registry/blob_spec.rb
+%%WWWDIR%%/spec/lib/container_registry/client_spec.rb
 %%WWWDIR%%/spec/lib/container_registry/path_spec.rb
 %%WWWDIR%%/spec/lib/container_registry/registry_spec.rb
 %%WWWDIR%%/spec/lib/container_registry/tag_spec.rb
@@ -8309,6 +8663,7 @@
 %%WWWDIR%%/spec/lib/event_filter_spec.rb
 %%WWWDIR%%/spec/lib/expand_variables_spec.rb
 %%WWWDIR%%/spec/lib/extracts_path_spec.rb
+%%WWWDIR%%/spec/lib/feature_spec.rb
 %%WWWDIR%%/spec/lib/file_size_validator_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/allowable_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/asciidoc_spec.rb
@@ -8377,6 +8732,7 @@
 %%WWWDIR%%/spec/lib/gitlab/ci/config_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/cron_parser_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/pipeline_duration_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/ci/stage/seed_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/status/build/action_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/status/build/common_spec.rb
@@ -8407,6 +8763,7 @@
 %%WWWDIR%%/spec/lib/gitlab/ci/status/success_warning_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/trace/stream_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/ci/trace_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/ci_access_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/closing_issue_extractor_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/color_schemes_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/conflict/file_collection_spec.rb
@@ -8446,9 +8803,22 @@
 %%WWWDIR%%/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/database_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/cartfile_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/composer_json_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/gemfile_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/gemspec_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/godeps_json_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/package_json_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/podfile_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/podspec_json_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/podspec_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker/requirements_txt_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/dependency_linker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/diff/diff_refs_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/file_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/highlight_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_markdown_marker_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_marker_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/diff/line_mapper_spec.rb
@@ -8466,10 +8836,13 @@
 %%WWWDIR%%/spec/lib/gitlab/email/message/repository_push_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/email/receiver_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/email/reply_parser_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/encoding_helper_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/etag_caching/middleware_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/etag_caching/router_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/exclusive_lease_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/fake_application_settings_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/file_detector_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/file_finder_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/fogbugz_import/client_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
@@ -8482,7 +8855,6 @@
 %%WWWDIR%%/spec/lib/gitlab/git/compare_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/diff_collection_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/diff_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/git/encoding_helper_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/env_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/hook_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/index_spec.rb
@@ -8496,6 +8868,8 @@
 %%WWWDIR%%/spec/lib/gitlab/git_ref_validator_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/commit_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/gitaly_client/diff_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/notifications_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client/ref_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitaly_client_spec.rb
@@ -8508,7 +8882,6 @@
 %%WWWDIR%%/spec/lib/gitlab/github_import/label_formatter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/github_import/milestone_formatter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/github_import/project_creator_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/gl_repository_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/github_import/release_formatter_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/github_import/user_formatter_spec.rb
@@ -8516,12 +8889,15 @@
 %%WWWDIR%%/spec/lib/gitlab/gitlab_import/client_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitlab_import/importer_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/gl_repository_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/google_code_import/client_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/google_code_import/importer_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/google_code_import/project_creator_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/graphs/commits_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/group_hierarchy_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/health_checks/db_check_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/health_checks/redis_check_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/health_checks/simple_check_shared.rb
 %%WWWDIR%%/spec/lib/gitlab/highlight_spec.rb
@@ -8583,14 +8959,19 @@
 %%WWWDIR%%/spec/lib/gitlab/middleware/multipart_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/o_auth/provider_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/o_auth/user_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/optimistic_locking_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/other_markup_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/otp_key_rotator_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/path_regex_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/polling_interval_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/popen_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/project_authorizations_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/project_search_results_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/project_transfer_spec.rb
-%%WWWDIR%%/spec/lib/gitlab/prometheus_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/prometheus_client_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/redis_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/reference_extractor_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/regex_spec.rb
@@ -8621,7 +9002,10 @@
 %%WWWDIR%%/spec/lib/gitlab/slash_commands/dsl_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/slash_commands/extractor_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/snippet_search_results_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/sql/recursive_cte_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/sql/union_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/string_range_marker_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/string_regex_marker_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/template/gitignore_template_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/template/issue_template_spec.rb
@@ -8653,6 +9037,8 @@
 %%WWWDIR%%/spec/lib/microsoft_teams/activity_spec.rb
 %%WWWDIR%%/spec/lib/microsoft_teams/notifier_spec.rb
 %%WWWDIR%%/spec/lib/repository_cache_spec.rb
+%%WWWDIR%%/spec/lib/system_check/simple_executor_spec.rb
+%%WWWDIR%%/spec/lib/system_check_spec.rb
 %%WWWDIR%%/spec/mailers/abuse_report_mailer_spec.rb
 %%WWWDIR%%/spec/mailers/emails/merge_requests_spec.rb
 %%WWWDIR%%/spec/mailers/emails/profile_spec.rb
@@ -8661,21 +9047,26 @@
 %%WWWDIR%%/spec/mailers/previews/notify_preview.rb
 %%WWWDIR%%/spec/mailers/repository_check_mailer_spec.rb
 %%WWWDIR%%/spec/migrations/active_record/schema_spec.rb
+%%WWWDIR%%/spec/migrations/add_head_pipeline_for_each_merge_request_spec.rb
 %%WWWDIR%%/spec/migrations/clean_appearance_symlinks_spec.rb
 %%WWWDIR%%/spec/migrations/clean_upload_symlinks_spec.rb
-%%WWWDIR%%/spec/migrations/fill_authorized_projects_spec.rb
+%%WWWDIR%%/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
 %%WWWDIR%%/spec/migrations/fix_wrongly_renamed_routes_spec.rb
-%%WWWDIR%%/spec/migrations/migrate_build_events_to_pipeline_events_spec.rb
+%%WWWDIR%%/spec/migrations/migrate_build_stage_reference_again_spec.rb
+%%WWWDIR%%/spec/migrations/migrate_old_artifacts_spec.rb
+%%WWWDIR%%/spec/migrations/migrate_pipeline_stages_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_process_commit_worker_jobs_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_user_activities_to_users_last_activity_on_spec.rb
 %%WWWDIR%%/spec/migrations/migrate_user_project_view_spec.rb
+%%WWWDIR%%/spec/migrations/move_personal_snippets_files_spec.rb
 %%WWWDIR%%/spec/migrations/move_uploads_to_system_dir_spec.rb
 %%WWWDIR%%/spec/migrations/remove_dot_git_from_usernames_spec.rb
 %%WWWDIR%%/spec/migrations/rename_more_reserved_project_names_spec.rb
 %%WWWDIR%%/spec/migrations/rename_reserved_project_names_spec.rb
 %%WWWDIR%%/spec/migrations/rename_system_namespaces_spec.rb
 %%WWWDIR%%/spec/migrations/rename_users_with_renamed_namespace_spec.rb
-%%WWWDIR%%/spec/migrations/update_retried_for_ci_builds_spec.rb
+%%WWWDIR%%/spec/migrations/turn_nested_groups_into_regular_groups_for_mysql_spec.rb
+%%WWWDIR%%/spec/migrations/update_retried_for_ci_build_spec.rb
 %%WWWDIR%%/spec/migrations/update_upload_paths_to_system_spec.rb
 %%WWWDIR%%/spec/models/ability_spec.rb
 %%WWWDIR%%/spec/models/abuse_report_spec.rb
@@ -8684,6 +9075,16 @@
 %%WWWDIR%%/spec/models/award_emoji_spec.rb
 %%WWWDIR%%/spec/models/blob_spec.rb
 %%WWWDIR%%/spec/models/blob_viewer/base_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/changelog_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/composer_json_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/gemspec_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/gitlab_ci_yml_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/license_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/package_json_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/podspec_json_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/podspec_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/route_map_spec.rb
+%%WWWDIR%%/spec/models/blob_viewer/server_side_spec.rb
 %%WWWDIR%%/spec/models/board_spec.rb
 %%WWWDIR%%/spec/models/broadcast_message_spec.rb
 %%WWWDIR%%/spec/models/chat_name_spec.rb
@@ -8691,10 +9092,10 @@
 %%WWWDIR%%/spec/models/ci/artifact_blob_spec.rb
 %%WWWDIR%%/spec/models/ci/build_spec.rb
 %%WWWDIR%%/spec/models/ci/group_spec.rb
+%%WWWDIR%%/spec/models/ci/legacy_stage_spec.rb
 %%WWWDIR%%/spec/models/ci/pipeline_schedule_spec.rb
 %%WWWDIR%%/spec/models/ci/pipeline_spec.rb
 %%WWWDIR%%/spec/models/ci/runner_spec.rb
-%%WWWDIR%%/spec/models/ci/stage_spec.rb
 %%WWWDIR%%/spec/models/ci/trigger_spec.rb
 %%WWWDIR%%/spec/models/ci/variable_spec.rb
 %%WWWDIR%%/spec/models/commit_range_spec.rb
@@ -8756,6 +9157,7 @@
 %%WWWDIR%%/spec/models/hooks/project_hook_spec.rb
 %%WWWDIR%%/spec/models/hooks/service_hook_spec.rb
 %%WWWDIR%%/spec/models/hooks/system_hook_spec.rb
+%%WWWDIR%%/spec/models/hooks/web_hook_log_spec.rb
 %%WWWDIR%%/spec/models/hooks/web_hook_spec.rb
 %%WWWDIR%%/spec/models/identity_spec.rb
 %%WWWDIR%%/spec/models/issue/metrics_spec.rb
@@ -8827,6 +9229,8 @@
 %%WWWDIR%%/spec/models/project_team_spec.rb
 %%WWWDIR%%/spec/models/project_wiki_spec.rb
 %%WWWDIR%%/spec/models/protectable_dropdown_spec.rb
+%%WWWDIR%%/spec/models/protected_branch/merge_access_level_spec.rb
+%%WWWDIR%%/spec/models/protected_branch/push_access_level_spec.rb
 %%WWWDIR%%/spec/models/protected_branch_spec.rb
 %%WWWDIR%%/spec/models/protected_tag_spec.rb
 %%WWWDIR%%/spec/models/redirect_route_spec.rb
@@ -8852,6 +9256,7 @@
 %%WWWDIR%%/spec/policies/base_policy_spec.rb
 %%WWWDIR%%/spec/policies/ci/build_policy_spec.rb
 %%WWWDIR%%/spec/policies/ci/trigger_policy_spec.rb
+%%WWWDIR%%/spec/policies/deploy_key_policy_spec.rb
 %%WWWDIR%%/spec/policies/environment_policy_spec.rb
 %%WWWDIR%%/spec/policies/group_policy_spec.rb
 %%WWWDIR%%/spec/policies/issue_policy_spec.rb
@@ -8861,6 +9266,7 @@
 %%WWWDIR%%/spec/policies/user_policy_spec.rb
 %%WWWDIR%%/spec/presenters/ci/build_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/ci/pipeline_presenter_spec.rb
+%%WWWDIR%%/spec/presenters/conversational_development_index/metric_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/merge_request_presenter_spec.rb
 %%WWWDIR%%/spec/presenters/projects/settings/deploy_keys_presenter_spec.rb
 %%WWWDIR%%/spec/rails_helper.rb
@@ -8876,6 +9282,8 @@
 %%WWWDIR%%/spec/requests/api/deployments_spec.rb
 %%WWWDIR%%/spec/requests/api/doorkeeper_access_spec.rb
 %%WWWDIR%%/spec/requests/api/environments_spec.rb
+%%WWWDIR%%/spec/requests/api/events_spec.rb
+%%WWWDIR%%/spec/requests/api/features_spec.rb
 %%WWWDIR%%/spec/requests/api/files_spec.rb
 %%WWWDIR%%/spec/requests/api/groups_spec.rb
 %%WWWDIR%%/spec/requests/api/helpers_spec.rb
@@ -8893,6 +9301,7 @@
 %%WWWDIR%%/spec/requests/api/notes_spec.rb
 %%WWWDIR%%/spec/requests/api/notification_settings_spec.rb
 %%WWWDIR%%/spec/requests/api/oauth_tokens_spec.rb
+%%WWWDIR%%/spec/requests/api/pipeline_schedules_spec.rb
 %%WWWDIR%%/spec/requests/api/pipelines_spec.rb
 %%WWWDIR%%/spec/requests/api/project_hooks_spec.rb
 %%WWWDIR%%/spec/requests/api/project_snippets_spec.rb
@@ -8962,6 +9371,7 @@
 %%WWWDIR%%/spec/routing/openid_connect_spec.rb
 %%WWWDIR%%/spec/routing/project_routing_spec.rb
 %%WWWDIR%%/spec/routing/routing_spec.rb
+%%WWWDIR%%/spec/rubocop/cop/activerecord_serialize_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/custom_error_class_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/gem_fetcher_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/migration/add_column_with_default_to_large_table_spec.rb
@@ -8970,6 +9380,9 @@
 %%WWWDIR%%/spec/rubocop/cop/migration/remove_concurrent_index_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/migration/remove_index_spec.rb
 %%WWWDIR%%/spec/rubocop/cop/migration/reversible_add_column_with_default_spec.rb
+%%WWWDIR%%/spec/rubocop/cop/migration/update_column_in_batches_spec.rb
+%%WWWDIR%%/spec/rubocop/cop/polymorphic_associations_spec.rb
+%%WWWDIR%%/spec/rubocop/cop/redirect_with_status_spec.rb
 %%WWWDIR%%/spec/serializers/analytics_build_entity_spec.rb
 %%WWWDIR%%/spec/serializers/analytics_build_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/analytics_issue_entity_spec.rb
@@ -8979,7 +9392,7 @@
 %%WWWDIR%%/spec/serializers/analytics_summary_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/build_action_entity_spec.rb
 %%WWWDIR%%/spec/serializers/build_artifact_entity_spec.rb
-%%WWWDIR%%/spec/serializers/build_entity_spec.rb
+%%WWWDIR%%/spec/serializers/build_details_entity_spec.rb
 %%WWWDIR%%/spec/serializers/build_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/commit_entity_spec.rb
 %%WWWDIR%%/spec/serializers/deploy_key_entity_spec.rb
@@ -8989,13 +9402,16 @@
 %%WWWDIR%%/spec/serializers/environment_entity_spec.rb
 %%WWWDIR%%/spec/serializers/environment_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/event_entity_spec.rb
+%%WWWDIR%%/spec/serializers/job_entity_spec.rb
 %%WWWDIR%%/spec/serializers/label_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/merge_request_basic_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/merge_request_entity_spec.rb
 %%WWWDIR%%/spec/serializers/merge_request_serializer_spec.rb
+%%WWWDIR%%/spec/serializers/pipeline_details_entity_spec.rb
 %%WWWDIR%%/spec/serializers/pipeline_entity_spec.rb
 %%WWWDIR%%/spec/serializers/pipeline_serializer_spec.rb
 %%WWWDIR%%/spec/serializers/request_aware_entity_spec.rb
+%%WWWDIR%%/spec/serializers/runner_entity_spec.rb
 %%WWWDIR%%/spec/serializers/stage_entity_spec.rb
 %%WWWDIR%%/spec/serializers/status_entity_spec.rb
 %%WWWDIR%%/spec/serializers/user_entity_spec.rb
@@ -9033,11 +9449,13 @@
 %%WWWDIR%%/spec/services/delete_branch_service_spec.rb
 %%WWWDIR%%/spec/services/delete_merged_branches_service_spec.rb
 %%WWWDIR%%/spec/services/discussions/resolve_service_spec.rb
+%%WWWDIR%%/spec/services/discussions/update_diff_position_service_spec.rb
 %%WWWDIR%%/spec/services/event_create_service_spec.rb
 %%WWWDIR%%/spec/services/files/update_service_spec.rb
 %%WWWDIR%%/spec/services/git_hooks_service_spec.rb
 %%WWWDIR%%/spec/services/git_push_service_spec.rb
 %%WWWDIR%%/spec/services/git_tag_push_service_spec.rb
+%%WWWDIR%%/spec/services/gravatar_service_spec.rb
 %%WWWDIR%%/spec/services/groups/create_service_spec.rb
 %%WWWDIR%%/spec/services/groups/destroy_service_spec.rb
 %%WWWDIR%%/spec/services/groups/update_service_spec.rb
@@ -9083,7 +9501,6 @@
 %%WWWDIR%%/spec/services/notes/build_service_spec.rb
 %%WWWDIR%%/spec/services/notes/create_service_spec.rb
 %%WWWDIR%%/spec/services/notes/destroy_service_spec.rb
-%%WWWDIR%%/spec/services/notes/diff_position_update_service_spec.rb
 %%WWWDIR%%/spec/services/notes/post_process_service_spec.rb
 %%WWWDIR%%/spec/services/notes/slash_commands_service_spec.rb
 %%WWWDIR%%/spec/services/notes/update_service_spec.rb
@@ -9117,6 +9534,7 @@
 %%WWWDIR%%/spec/services/search_service_spec.rb
 %%WWWDIR%%/spec/services/slash_commands/interpret_service_spec.rb
 %%WWWDIR%%/spec/services/spam_service_spec.rb
+%%WWWDIR%%/spec/services/submit_usage_ping_service_spec.rb
 %%WWWDIR%%/spec/services/system_hooks_service_spec.rb
 %%WWWDIR%%/spec/services/system_note_service_spec.rb
 %%WWWDIR%%/spec/services/tags/create_service_spec.rb
@@ -9133,15 +9551,18 @@
 %%WWWDIR%%/spec/services/users/destroy_service_spec.rb
 %%WWWDIR%%/spec/services/users/migrate_to_ghost_user_service_spec.rb
 %%WWWDIR%%/spec/services/users/refresh_authorized_projects_service_spec.rb
+%%WWWDIR%%/spec/services/web_hook_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/create_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/destroy_service_spec.rb
 %%WWWDIR%%/spec/services/wiki_pages/update_service_spec.rb
+%%WWWDIR%%/spec/sidekiq/cron/job_gem_dependency_spec.rb
 %%WWWDIR%%/spec/simplecov_env.rb
 %%WWWDIR%%/spec/spec_helper.rb
 %%WWWDIR%%/spec/support/api/issues_resolving_discussions_shared_examples.rb
 %%WWWDIR%%/spec/support/api/members_shared_examples.rb
 %%WWWDIR%%/spec/support/api/repositories_shared_context.rb
 %%WWWDIR%%/spec/support/api/schema_matcher.rb
+%%WWWDIR%%/spec/support/api/scopes/read_user_shared_examples.rb
 %%WWWDIR%%/spec/support/api/status_shared_examples.rb
 %%WWWDIR%%/spec/support/api/time_tracking_shared_examples.rb
 %%WWWDIR%%/spec/support/api/v3/time_tracking_shared_examples.rb
@@ -9166,11 +9587,13 @@
 %%WWWDIR%%/spec/support/fake_u2f_device.rb
 %%WWWDIR%%/spec/support/features/discussion_comments_shared_example.rb
 %%WWWDIR%%/spec/support/features/issuable_slash_commands_shared_examples.rb
+%%WWWDIR%%/spec/support/features/reportable_note_shared_examples.rb
 %%WWWDIR%%/spec/support/features/resolving_discussions_in_issues_shared_examples.rb
 %%WWWDIR%%/spec/support/features/rss_shared_examples.rb
 %%WWWDIR%%/spec/support/filter_spec_helper.rb
 %%WWWDIR%%/spec/support/filtered_search_helpers.rb
 %%WWWDIR%%/spec/support/fixture_helpers.rb
+%%WWWDIR%%/spec/support/generate-seed-repo-rb
 %%WWWDIR%%/spec/support/git_http_helpers.rb
 %%WWWDIR%%/spec/support/gitaly.rb
 %%WWWDIR%%/spec/support/gitlab_stubs/gitlab_ci.yml
@@ -9180,6 +9603,8 @@
 %%WWWDIR%%/spec/support/gitlab_stubs/session.json
 %%WWWDIR%%/spec/support/gitlab_stubs/user.json
 %%WWWDIR%%/spec/support/helpers/fake_blob_helpers.rb
+%%WWWDIR%%/spec/support/helpers/key_generator_helper.rb
+%%WWWDIR%%/spec/support/helpers/note_interaction_helpers.rb
 %%WWWDIR%%/spec/support/import_export/common_util.rb
 %%WWWDIR%%/spec/support/import_export/configuration_helper.rb
 %%WWWDIR%%/spec/support/import_export/export_file_helper.rb
@@ -9202,6 +9627,7 @@
 %%WWWDIR%%/spec/support/matchers/be_url.rb
 %%WWWDIR%%/spec/support/matchers/be_valid_commit.rb
 %%WWWDIR%%/spec/support/matchers/email_matchers.rb
+%%WWWDIR%%/spec/support/matchers/execute_check.rb
 %%WWWDIR%%/spec/support/matchers/gitaly_matchers.rb
 %%WWWDIR%%/spec/support/matchers/gitlab_git_matchers.rb
 %%WWWDIR%%/spec/support/matchers/have_issuable_counts.rb
@@ -9214,6 +9640,7 @@
 %%WWWDIR%%/spec/support/matchers/user_activity_matchers.rb
 %%WWWDIR%%/spec/support/mentionable_shared_examples.rb
 %%WWWDIR%%/spec/support/merge_request_helpers.rb
+%%WWWDIR%%/spec/support/migrations_helpers.rb
 %%WWWDIR%%/spec/support/milestone_tabs_examples.rb
 %%WWWDIR%%/spec/support/mobile_helpers.rb
 %%WWWDIR%%/spec/support/notify_shared_examples.rb
@@ -9221,6 +9648,8 @@
 %%WWWDIR%%/spec/support/project_features_apply_to_issuables_shared_examples.rb
 %%WWWDIR%%/spec/support/project_hook_data_shared_example.rb
 %%WWWDIR%%/spec/support/prometheus_helpers.rb
+%%WWWDIR%%/spec/support/protected_branches/access_control_ce_shared_examples.rb
+%%WWWDIR%%/spec/support/protected_tags/access_control_ce_shared_examples.rb
 %%WWWDIR%%/spec/support/query_recorder.rb
 %%WWWDIR%%/spec/support/rake_helpers.rb
 %%WWWDIR%%/spec/support/reactive_caching_helpers.rb
@@ -9245,7 +9674,6 @@
 %%WWWDIR%%/spec/support/stub_env.rb
 %%WWWDIR%%/spec/support/stub_gitlab_calls.rb
 %%WWWDIR%%/spec/support/stub_gitlab_data.rb
-%%WWWDIR%%/spec/support/target_branch_helpers.rb
 %%WWWDIR%%/spec/support/taskable_shared_examples.rb
 %%WWWDIR%%/spec/support/test_env.rb
 %%WWWDIR%%/spec/support/time_tracking_shared_examples.rb
@@ -9254,9 +9682,7 @@
 %%WWWDIR%%/spec/support/updating_mentions_shared_examples.rb
 %%WWWDIR%%/spec/support/upload_helpers.rb
 %%WWWDIR%%/spec/support/user_activities_helpers.rb
-%%WWWDIR%%/spec/support/wait_for_ajax.rb
 %%WWWDIR%%/spec/support/wait_for_requests.rb
-%%WWWDIR%%/spec/support/wait_for_vue_resource.rb
 %%WWWDIR%%/spec/support/webmock.rb
 %%WWWDIR%%/spec/support/workhorse_helpers.rb
 %%WWWDIR%%/spec/tasks/config_lint_spec.rb
@@ -9273,9 +9699,12 @@
 %%WWWDIR%%/spec/tasks/gitlab/workhorse_rake_spec.rb
 %%WWWDIR%%/spec/tasks/tokens_spec.rb
 %%WWWDIR%%/spec/unicorn/unicorn_spec.rb
+%%WWWDIR%%/spec/uploaders/artifact_uploader_spec.rb
 %%WWWDIR%%/spec/uploaders/attachment_uploader_spec.rb
 %%WWWDIR%%/spec/uploaders/avatar_uploader_spec.rb
+%%WWWDIR%%/spec/uploaders/file_mover_spec.rb
 %%WWWDIR%%/spec/uploaders/file_uploader_spec.rb
+%%WWWDIR%%/spec/uploaders/gitlab_uploader_spec.rb
 %%WWWDIR%%/spec/uploaders/lfs_object_uploader_spec.rb
 %%WWWDIR%%/spec/uploaders/personal_file_uploader_spec.rb
 %%WWWDIR%%/spec/uploaders/records_uploads_spec.rb
@@ -9291,21 +9720,21 @@
 %%WWWDIR%%/spec/views/notify/pipeline_failed_email.html.haml_spec.rb
 %%WWWDIR%%/spec/views/notify/pipeline_success_email.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/_home_panel.html.haml_spec.rb
-%%WWWDIR%%/spec/views/projects/_last_commit.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/blob/_viewer.html.haml_spec.rb
-%%WWWDIR%%/spec/views/projects/builds/_build.html.haml_spec.rb
-%%WWWDIR%%/spec/views/projects/builds/_generic_commit_status.html.haml_spec.rb
-%%WWWDIR%%/spec/views/projects/builds/show.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/commit/_commit_box.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/commit/show.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/edit.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/environments/terminal.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/imports/new.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/issues/_related_branches.html.haml_spec.rb
+%%WWWDIR%%/spec/views/projects/jobs/_build.html.haml_spec.rb
+%%WWWDIR%%/spec/views/projects/jobs/_generic_commit_status.html.haml_spec.rb
+%%WWWDIR%%/spec/views/projects/jobs/show.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/merge_requests/_commits.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/merge_requests/_new_submit.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/merge_requests/edit.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/merge_requests/show.html.haml_spec.rb
+%%WWWDIR%%/spec/views/projects/notes/_more_actions_dropdown.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/pipelines/_stage.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/registry/repositories/index.html.haml_spec.rb
 %%WWWDIR%%/spec/views/projects/tags/index.html.haml_spec.rb
@@ -9335,6 +9764,7 @@
 %%WWWDIR%%/spec/workers/gitlab_usage_ping_worker_spec.rb
 %%WWWDIR%%/spec/workers/group_destroy_worker_spec.rb
 %%WWWDIR%%/spec/workers/merge_worker_spec.rb
+%%WWWDIR%%/spec/workers/namespaceless_project_destroy_worker_spec.rb
 %%WWWDIR%%/spec/workers/new_note_worker_spec.rb
 %%WWWDIR%%/spec/workers/pipeline_hooks_worker_spec.rb
 %%WWWDIR%%/spec/workers/pipeline_metrics_worker_spec.rb
@@ -9352,6 +9782,7 @@
 %%WWWDIR%%/spec/workers/reactive_caching_worker_spec.rb
 %%WWWDIR%%/spec/workers/remove_expired_group_links_worker_spec.rb
 %%WWWDIR%%/spec/workers/remove_expired_members_worker_spec.rb
+%%WWWDIR%%/spec/workers/remove_old_web_hook_logs_worker_spec.rb
 %%WWWDIR%%/spec/workers/remove_unreferenced_lfs_objects_worker_spec.rb
 %%WWWDIR%%/spec/workers/repository_check/batch_worker_spec.rb
 %%WWWDIR%%/spec/workers/repository_check/clear_worker_spec.rb
@@ -9367,15 +9798,25 @@
 %%WWWDIR%%/spec/workers/update_user_activity_worker_spec.rb
 %%WWWDIR%%/spec/workers/upload_checksum_worker_spec.rb
 %%WWWDIR%%/spec/workers/use_key_worker_spec.rb
+%%WWWDIR%%/vendor/Dockerfile/Binary-alpine.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Binary-scratch.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Binary.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/CONTRIBUTING.md
+%%WWWDIR%%/vendor/Dockerfile/Golang-alpine.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Golang-scratch.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Golang.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/HTTPd.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/LICENSE
+%%WWWDIR%%/vendor/Dockerfile/Node-alpine.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Node.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/OpenJDK-alpine.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/OpenJDK.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/PHP.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/Python-alpine.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/Python.Dockerfile
 %%WWWDIR%%/vendor/Dockerfile/Python2.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Ruby-alpine.Dockerfile
+%%WWWDIR%%/vendor/Dockerfile/Ruby.Dockerfile
 %%WWWDIR%%/vendor/assets/fonts/KaTeX_AMS-Regular.eot
 %%WWWDIR%%/vendor/assets/fonts/KaTeX_AMS-Regular.ttf
 %%WWWDIR%%/vendor/assets/fonts/KaTeX_AMS-Regular.woff
@@ -9473,7 +9914,8 @@
 %%WWWDIR%%/vendor/assets/javascripts/latinise.js
 %%WWWDIR%%/vendor/assets/javascripts/pdf.worker.js
 %%WWWDIR%%/vendor/assets/javascripts/pdflab.js
-%%WWWDIR%%/vendor/assets/javascripts/task_list.js
+%%WWWDIR%%/vendor/assets/javascripts/peek.js
+%%WWWDIR%%/vendor/assets/javascripts/peek.performance_bar.js
 %%WWWDIR%%/vendor/assets/javascripts/u2f.js
 %%WWWDIR%%/vendor/assets/javascripts/xterm/encoding-indexes.js
 %%WWWDIR%%/vendor/assets/javascripts/xterm/encoding.js
@@ -9481,6 +9923,7 @@
 %%WWWDIR%%/vendor/assets/javascripts/xterm/xterm.js
 %%WWWDIR%%/vendor/assets/stylesheets/cropper.css
 %%WWWDIR%%/vendor/assets/stylesheets/katex.scss
+%%WWWDIR%%/vendor/assets/stylesheets/peek.scss
 %%WWWDIR%%/vendor/assets/stylesheets/xterm/xterm.css
 %%WWWDIR%%/vendor/gitignore/Global/README.md
 %%WWWDIR%%/vendor/gitignore/LICENSE
@@ -9538,6 +9981,14 @@
 @dir(,,700) %%WWWDIR%%/builds
 @dir %%WWWDIR%%/lib/assets
 @dir %%WWWDIR%%/lib/ci/assets
+@dir(,,744) %%WWWDIR%%/locale/bg
+@dir(,,744) %%WWWDIR%%/locale/de
+@dir(,,744) %%WWWDIR%%/locale/en
+@dir(,,744) %%WWWDIR%%/locale/es
+@dir(,,744) %%WWWDIR%%/locale/pt_BR
+@dir(,,744) %%WWWDIR%%/locale/zh_CN
+@dir(,,744) %%WWWDIR%%/locale/zh_HK
+@dir(,,744) %%WWWDIR%%/locale/zh_TW
 @dir(,,744) %%WWWDIR%%/log
 @dir %%WWWDIR%%/public
 @dir %%WWWDIR%%/public/assets
@@ -9554,6 +10005,7 @@
 @dir(,,770) %%WWWDIR%%/tmp/backups
 @dir(,,770) %%WWWDIR%%/tmp/cache
 @dir(,,770) %%WWWDIR%%/tmp/pids
+@dir(,,770) %%WWWDIR%%/tmp/prometheus_multiproc_dir
 @dir(,,770) %%WWWDIR%%/tmp/sessions
 @dir(,,770) %%WWWDIR%%/tmp/sockets
 @dir(,,770) %%WWWDIR%%/tmp/sockets/private
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 609ec34db836..56a5c577d4ac 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hugo
-PORTVERSION=	0.26
+PORTVERSION=	0.27.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	go
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index bbf888ebafee..3ea1340c5c22 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1502359028
-SHA256 (gohugo/gohugoio-hugo-v0.26_GH0.tar.gz) = 1e76b6f5f0281d845c2189f7f3ae065a3ec38e32c560f4b573188878998f9c68
-SIZE (gohugo/gohugoio-hugo-v0.26_GH0.tar.gz) = 17353541
+TIMESTAMP = 1505338021
+SHA256 (gohugo/gohugoio-hugo-v0.27.1_GH0.tar.gz) = b357b4e3edd8934dbbbc6a04b57a36c07f1923ac3891b6f822fadd48ccaaeaba
+SIZE (gohugo/gohugoio-hugo-v0.27.1_GH0.tar.gz) = 19680569
 SHA256 (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 68dc067c4105cd20a642ddf1f4acaada7474c1b58e5b249d4bd9b0d7e8edebc2
 SIZE (gohugo/BurntSushi-toml-a368813_GH0.tar.gz) = 42252
 SHA256 (gohugo/PuerkitoBio-purell-b938d81_GH0.tar.gz) = b10cdc245094af0100616b8ea71cb68658b3dd29ce8fc32d0b956e1508288067
diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index e62b464a87c0..1d55485a0d45 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	h2o
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 01ab6f77bd39..326d1c09a50a 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hiawatha
 PORTVERSION=	10.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index 2b383ff4dfbd..1a75773c6ccd 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kannel-sqlbox
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 05abdf03c96d..cc2c8a58621b 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kannel
 PORTVERSION=	1.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
diff --git a/www/kf5-kdewebkit/Makefile b/www/kf5-kdewebkit/Makefile
index 94c0290c9ead..0af7d429fac5 100644
--- a/www/kf5-kdewebkit/Makefile
+++ b/www/kf5-kdewebkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kdewebkit
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile
index 3a467391f152..996fc4c6c4d3 100644
--- a/www/kf5-khtml/Makefile
+++ b/www/kf5-khtml/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	khtml
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-kjs/Makefile b/www/kf5-kjs/Makefile
index f6d0144c9089..acb2f52c9b85 100644
--- a/www/kf5-kjs/Makefile
+++ b/www/kf5-kjs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kjs
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/kf5-kjsembed/Makefile b/www/kf5-kjsembed/Makefile
index f95794bc76b0..452f433861c9 100644
--- a/www/kf5-kjsembed/Makefile
+++ b/www/kf5-kjsembed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kjsembed
 PORTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile
index 5cc64296e367..d32a39af5de1 100644
--- a/www/linux-flashplayer/Makefile
+++ b/www/linux-flashplayer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flashplayer
-PORTVERSION=	26.0.0.151
+PORTVERSION=	27.0.0.130
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo
index 8512f1b3471c..961e56293477 100644
--- a/www/linux-flashplayer/distinfo
+++ b/www/linux-flashplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502343857
-SHA256 (flashplayer/26.0.0.151/flash_player_npapi_linux.i386.tar.gz) = 179a751d1c3624f3a25ec4198a54e6a53023a11de0b24f71c86f5b12fafa2cb8
-SIZE (flashplayer/26.0.0.151/flash_player_npapi_linux.i386.tar.gz) = 8492462
+TIMESTAMP = 1505243820
+SHA256 (flashplayer/27.0.0.130/flash_player_npapi_linux.i386.tar.gz) = 4615bec6a21822629ce7e0f5bf768ef12fe09c275f4bb18892563da20d9b7c62
+SIZE (flashplayer/27.0.0.130/flash_player_npapi_linux.i386.tar.gz) = 8511696
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 64cc89f60de2..bff140cec83c 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -19,20 +19,18 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libopkele.so:devel/libopkele \
 		libsqlite3.so:databases/sqlite3
 
+USES=		autoreconf cpe gmake libtool pkgconfig
+USE_APACHE=	22+
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmuller
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openid.so
-
-USE_APACHE=	22+
-USES=		autoreconf cpe gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
+CFLAGS+=	-I${LOCALBASE}/include -I/usr/include/openssl
 
 CPE_VENDOR=	findingscience
 
-CFLAGS+=	-I${LOCALBASE}/include -I/usr/include/openssl
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${APXS} -i|$${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
 		${WRKSRC}/src/Makefile.am
diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile
new file mode 100644
index 000000000000..c48997c00723
--- /dev/null
+++ b/www/mod_auth_openidc/Makefile
@@ -0,0 +1,54 @@
+# Created by: Ryan Steinmetz <zi@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	mod_auth_openidc
+PORTVERSION=	2.3.1
+DISTVERSIONPREFIX=	v
+CATEGORIES=	www
+PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	OpenID Connect Relying Party and OAuth 2.0 Resource Server for Apache
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+LIB_DEPENDS=	libcjose.so:devel/cjose \
+		libcurl.so:ftp/curl \
+		libjansson.so:devel/jansson \
+		libpcre.so:devel/pcre
+
+USES=		autoreconf:autoconf cpe gmake libtool pkgconfig ssl
+USE_APACHE=	22+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pingidentity
+CPE_VENDOR=	${GH_ACCOUNT}
+
+PLIST_FILES=	${APACHEMODDIR}/mod_auth_openidc.so
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
+		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=		HIREDIS
+HIREDIS_DESC=		Enable using redis to store session data
+HIREDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
+HIREDIS_CONFIGURE_WITH=	hiredis
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|@APXS2@ @APXS2_OPTS@ -i|@APXS2@ @APXS2_OPTS@ -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
+		${WRKSRC}/Makefile.in
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
+		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
+	${INSTALL_DATA} ${WRKSRC}/auth_openidc.conf \
+		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/auth_openidc.conf.sample
+
+.include <bsd.port.mk>
diff --git a/www/mod_auth_openidc/distinfo b/www/mod_auth_openidc/distinfo
new file mode 100644
index 000000000000..5008c690a81e
--- /dev/null
+++ b/www/mod_auth_openidc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505264187
+SHA256 (pingidentity-mod_auth_openidc-v2.3.1_GH0.tar.gz) = 4bbed6531b24bfcfd3e2e10911831216a68246a00908a226a97812f9fc9cd337
+SIZE (pingidentity-mod_auth_openidc-v2.3.1_GH0.tar.gz) = 210766
diff --git a/www/mod_auth_openidc/files/pkg-message.in b/www/mod_auth_openidc/files/pkg-message.in
new file mode 100644
index 000000000000..17b27c4c3282
--- /dev/null
+++ b/www/mod_auth_openidc/files/pkg-message.in
@@ -0,0 +1,7 @@
+===========================================================================
+Please add the following to %%PREFIX%%/%%APACHEETCDIR%%/httpd.conf:
+LoadModule auth_openidc_module %%APACHEMODDIR%%/mod_auth_openidc.so
+
+Then update the following config file with your settings:
+%%PREFIX%%/%%APACHEETCDIR%%/Includes/auth_openidc.conf
+===========================================================================
diff --git a/www/mod_auth_openidc/pkg-descr b/www/mod_auth_openidc/pkg-descr
new file mode 100644
index 000000000000..7bb88496c64d
--- /dev/null
+++ b/www/mod_auth_openidc/pkg-descr
@@ -0,0 +1,7 @@
+mod_auth_openidc is an authentication/authorization module for the Apache 2.x
+HTTP server that functions as an OpenID Connect Relying Party, authenticating
+users against an OpenID Connect Provider. It can also function as an OAuth 2.0
+Resource Server, validating OAuth 2.0 access tokens presented by OAuth 2.0
+Clients.
+
+WWW: https://github.com/pingidentity/mod_auth_openidc/
diff --git a/www/mod_auth_openidc/pkg-plist b/www/mod_auth_openidc/pkg-plist
new file mode 100644
index 000000000000..a4e7d3ff90ad
--- /dev/null
+++ b/www/mod_auth_openidc/pkg-plist
@@ -0,0 +1 @@
+@sample %%APACHEETCDIR%%/Includes/auth_openidc.conf.sample
diff --git a/www/mod_authnz_crowd/Makefile b/www/mod_authnz_crowd/Makefile
index d5fbf08e9a94..5e5baee7fe39 100644
--- a/www/mod_authnz_crowd/Makefile
+++ b/www/mod_authnz_crowd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_authnz_crowd
 PORTVERSION=	2.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.atlassian.com/software/crowd/downloads/cwdapache/
 DIST_SUBDIR=	apache2
diff --git a/www/mod_cvs2/Makefile b/www/mod_cvs2/Makefile
index 711fcc663cf7..6dc356b07001 100644
--- a/www/mod_cvs2/Makefile
+++ b/www/mod_cvs2/Makefile
@@ -11,6 +11,11 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Module that makes Apache 2 CVS aware
 
+LICENSE=	AFL12
+LICENSE_NAME=	Academic Free License 1.2
+LICENSE_FILE=	${WRKSRC}/LICENSE.AFL
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
@@ -19,9 +24,9 @@ PORTDOCS=	reference.html guide.html README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS:NREADME}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/mod_md-devel/Makefile b/www/mod_md-devel/Makefile
index a9039a61f315..a1535625b870 100644
--- a/www/mod_md-devel/Makefile
+++ b/www/mod_md-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_md-devel
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -23,7 +23,8 @@ GH_ACCOUNT=	icing
 GH_PROJECT=	mod_md
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=ext-
+CONFIGURE_ARGS=	--program-prefix=ext- \
+		--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV=	CONFIG_SHELL=/bin/sh
 
 MODULENAME=	${GH_PROJECT}
@@ -34,7 +35,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 DOCSDIR=	share/doc/mod_md
 PORTDOCS=	README README.md
 PLIST_FILES=	${APACHEMODDIR}/mod_md.so.0.0.0 \
-		${APACHEMODDIR}/mod_md.so
+		${APACHEMODDIR}/mod_md.so \
+		bin/a2md
 
 .include <bsd.port.pre.mk>
 
@@ -44,6 +46,7 @@ IGNORE=		port requires OpenSSL 1.0.2 or later, set DEFAULT_VERSIONS+= ssl=openss
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
+	${INSTALL} ${WRKSRC}/src/a2md ${STAGEDIR}${PREFIX}/bin/a2md
 	${RM} ${STAGEDIR}${PREFIX}/share/doc/mod_md/LICENSE
 	${RM} ${STAGEDIR}${PREFIX}/bin/ext-a2md
 
diff --git a/www/mod_md-devel/distinfo b/www/mod_md-devel/distinfo
index db5ed413fd78..7d5d53e51561 100644
--- a/www/mod_md-devel/distinfo
+++ b/www/mod_md-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504621105
-SHA256 (icing-mod_md-v0.8.0_GH0.tar.gz) = f3fdfdacb1061f04bd6aedde9ea229c5dd68b9b7cce4f7a407571f7563057f1a
-SIZE (icing-mod_md-v0.8.0_GH0.tar.gz) = 180674
+TIMESTAMP = 1505388780
+SHA256 (icing-mod_md-v0.9.5_GH0.tar.gz) = 496259a9f61ab63deb1724bffa1bdf72944495290e4b7b8e7b2a66b9d2f8e0da
+SIZE (icing-mod_md-v0.9.5_GH0.tar.gz) = 188786
diff --git a/www/mod_md-devel/files/extra-patch-mod_ssl b/www/mod_md-devel/files/extra-patch-mod_ssl
new file mode 100644
index 000000000000..89797ff53acd
--- /dev/null
+++ b/www/mod_md-devel/files/extra-patch-mod_ssl
@@ -0,0 +1,279 @@
+Index: modules/ssl/ssl_engine_init.c
+===================================================================
+--- modules/ssl/ssl_engine_init.c	(revision 1808124)
++++ modules/ssl/ssl_engine_init.c	(working copy)
+@@ -164,6 +164,41 @@
+                  modver, AP_SERVER_BASEVERSION, incver);
+ }
+ 
++/**************************************************************************************************/
++/* Managed Domains Interface (temporary here) */
++
++APR_DECLARE_OPTIONAL_FN(int, 
++                        md_is_managed, (struct server_rec *));
++
++APR_DECLARE_OPTIONAL_FN(apr_status_t, 
++                        md_get_credentials, (struct server_rec *, apr_pool_t *,
++                                             const char **pkeyfile, 
++                                             const char **pcertfile, 
++                                             const char **pchainfile));
++APR_DECLARE_OPTIONAL_FN(apr_status_t, 
++                        md_get_certificate, (struct server_rec *, apr_pool_t *,
++                                             const char **pkeyfile, 
++                                             const char **pcertfile));
++APR_DECLARE_OPTIONAL_FN(int, 
++                        md_is_challenge, (struct conn_rec *, const char *,
++                                          X509 **, EVP_PKEY **));
++                                          
++static APR_OPTIONAL_FN_TYPE(md_is_managed) *md_is_managed;
++static APR_OPTIONAL_FN_TYPE(md_get_credentials) *md_get_credentials;
++static APR_OPTIONAL_FN_TYPE(md_get_certificate) *md_get_certificate;
++static APR_OPTIONAL_FN_TYPE(md_is_challenge) *md_is_challenge;
++
++int ssl_is_challenge(conn_rec *c, const char *servername, 
++                     X509 **pcert, EVP_PKEY **pkey)
++{
++    if (md_is_challenge) {
++        return md_is_challenge(c, servername, pcert, pkey);
++    }
++    *pcert = NULL;
++    *pkey = NULL;
++    return 0;
++}
++
+ /*
+  *  Per-module initialization
+  */
+@@ -204,6 +239,18 @@
+     ssl_config_global_create(base_server); /* just to avoid problems */
+     ssl_config_global_fix(mc);
+ 
++    /* Initialize our interface to mod_md, if it is loaded 
++     */
++    md_is_managed = APR_RETRIEVE_OPTIONAL_FN(md_is_managed);
++    md_get_credentials = APR_RETRIEVE_OPTIONAL_FN(md_get_credentials);
++    md_get_certificate = APR_RETRIEVE_OPTIONAL_FN(md_get_certificate);
++    md_is_challenge = APR_RETRIEVE_OPTIONAL_FN(md_is_challenge);
++    if (!md_is_managed || (!md_get_credentials && !md_get_certificate)) {
++        md_is_managed = NULL;
++        md_get_credentials = NULL;
++        md_get_certificate = NULL;
++    }
++
+     /*
+      *  try to fix the configuration and open the dedicated SSL
+      *  logfile as early as possible
+@@ -1606,6 +1653,57 @@
+         return APR_EGENERAL;
+     }
+ 
++    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO()
++                 "Init: (%s) mod_md support is %s.", ssl_util_vhostid(p, s),
++                 md_is_managed? "available" : "unavailable");
++    if (md_is_managed && md_is_managed(s)) {
++        modssl_pk_server_t *const pks = sc->server->pks;
++        if (pks->cert_files->nelts > 0 || pks->key_files->nelts > 0) {
++            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
++                         "Init: (%s) You configured certificate/key files on this host, but "
++                         "is is covered by a Managed Domain. You need to remove these directives "
++                         "for the Managed Domain to take over.", ssl_util_vhostid(p, s));
++        }
++        else {
++            const char *key_file, *cert_file, *chain_file;
++            
++            key_file = cert_file = chain_file = NULL;
++            
++            if (md_get_certificate) {
++                /* mod_md >= v0.9.0 */
++                rv = md_get_certificate(s, p, &key_file, &cert_file);
++            }
++            else if (md_get_credentials) {
++                /* mod_md < v0.9.0, remove this after a while */
++                rv = md_get_credentials(s, p, &key_file, &cert_file, &chain_file);
++            }
++            else {
++                rv = APR_ENOTIMPL;
++            }
++            
++            if (key_file && cert_file) {
++                ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, s, 
++                             "%s: installing key=%s, cert=%s, chain=%s", 
++                             ssl_util_vhostid(p, s), key_file, cert_file, chain_file);
++                APR_ARRAY_PUSH(pks->key_files, const char *) = key_file;
++                APR_ARRAY_PUSH(pks->cert_files, const char *) = cert_file;
++                sc->server->cert_chain = chain_file;
++            }
++            
++            if (APR_STATUS_IS_EAGAIN(rv)) {
++                /* Managed Domain not ready yet. This is not a reason to fail the config */
++                ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO()
++                             "Init: %s will respond with '503 Service Unavailable' for now. This "
++                             "host is part of a Managed Domain, but no SSL certificate is "
++                             "available (yet).", ssl_util_vhostid(p, s));
++                pks->service_unavailable = 1;
++            }
++            else if (rv != APR_SUCCESS) {
++                return rv;
++            }
++        }
++    }
++    
+     if ((rv = ssl_init_ctx(s, p, ptemp, sc->server)) != APR_SUCCESS) {
+         return rv;
+     }
+Index: modules/ssl/ssl_engine_kernel.c
+===================================================================
+--- modules/ssl/ssl_engine_kernel.c	(revision 1808124)
++++ modules/ssl/ssl_engine_kernel.c	(working copy)
+@@ -264,6 +264,15 @@
+         return DECLINED;
+     }
+ 
++    if (sslconn->service_unavailable) {
++        /* This is set when the SSL properties of this connection are
++         * incomplete or if this connection was made to challenge a 
++         * particular hostname (ACME). We never serve any request on 
++         * such a connection. */
++         /* TODO: a retry-after indicator would be nice here */
++        return HTTP_SERVICE_UNAVAILABLE;
++    }
++
+     if (sslconn->non_ssl_request == NON_SSL_SET_ERROR_MSG) {
+         apr_table_setn(r->notes, "error-notes",
+                        "Reason: You're speaking plain HTTP to an SSL-enabled "
+@@ -2110,6 +2119,8 @@
+ static apr_status_t init_vhost(conn_rec *c, SSL *ssl)
+ {
+     const char *servername;
++    X509 *cert;
++    EVP_PKEY *key;
+     
+     if (c) {
+         SSLConnRec *sslcon = myConnConfig(c);
+@@ -2126,8 +2137,35 @@
+                 ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02043)
+                               "SSL virtual host for servername %s found",
+                               servername);
++                
+                 return APR_SUCCESS;
+             }
++            else if (ssl_is_challenge(c, servername, &cert, &key)) {
++            
++                sslcon->service_unavailable = 1;
++                if ((SSL_use_certificate(ssl, cert) < 1)) {
++                    ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c, APLOGNO()
++                                  "Failed to configure challenge certificate %s",
++                                  servername);
++                    return APR_EGENERAL;
++                }
++                
++                if (!SSL_use_PrivateKey(ssl, key)) {
++                    ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c, APLOGNO()
++                                  "error '%s' using Challenge key: %s",
++                                  ERR_error_string(ERR_peek_last_error(), NULL), 
++                                  servername);
++                    return APR_EGENERAL;
++                }
++                
++                if (SSL_check_private_key(ssl) < 1) {
++                    ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, c, APLOGNO()
++                                  "Challenbge certificate and private key %s "
++                                  "do not match", servername);
++                    return APR_EGENERAL;
++                }
++                
++            }
+             else {
+                 ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02044)
+                               "No matching SSL virtual host for servername "
+@@ -2233,6 +2271,8 @@
+          */
+         sslcon->server = s;
+         sslcon->cipher_suite = sc->server->auth.cipher_suite;
++        sslcon->service_unavailable = sc->server->pks? 
++            sc->server->pks->service_unavailable : 0; 
+         
+         ap_update_child_status_from_server(c->sbh, SERVER_BUSY_READ, c, s);
+         /*
+Index: modules/ssl/ssl_private.h
+===================================================================
+--- modules/ssl/ssl_private.h	(revision 1808124)
++++ modules/ssl/ssl_private.h	(working copy)
+@@ -524,6 +524,7 @@
+     server_rec *server;
+     
+     const char *cipher_suite; /* cipher suite used in last reneg */
++    int service_unavailable;  /* thouugh we negotiate SSL, no requests will be served */
+ } SSLConnRec;
+ 
+ /* BIG FAT WARNING: SSLModConfigRec has unusual memory lifetime: it is
+@@ -600,6 +601,9 @@
+      * sent in the CertificateRequest message: */
+     const char  *ca_name_path;
+     const char  *ca_name_file;
++    
++    /* TLS service for this server is suspended */
++    int service_unavailable;
+ } modssl_pk_server_t;
+ 
+ typedef struct {
+@@ -1063,6 +1067,9 @@
+  * memory. */
+ DH *modssl_get_dh_params(unsigned keylen);
+ 
++int ssl_is_challenge(conn_rec *c, const char *servername, 
++                     X509 **pcert, EVP_PKEY **pkey);
++
+ #endif /* SSL_PRIVATE_H */
+ /** @} */
+ 
+Index: modules/ssl/ssl_util_ssl.c
+===================================================================
+--- modules/ssl/ssl_util_ssl.c	(revision 1808124)
++++ modules/ssl/ssl_util_ssl.c	(working copy)
+@@ -115,6 +115,33 @@
+     return rc;
+ }
+ 
++typedef struct {
++    const char *pass;
++    int pass_len;
++} pass_ctx;
++
++static int provide_pass(char *buf, int size, int rwflag, void *baton)
++{
++    pass_ctx *ctx = baton;
++    if (ctx->pass_len > 0) {
++        if (ctx->pass_len < size) {
++            size = (int)ctx->pass_len;
++        }
++        memcpy(buf, ctx->pass, size);
++    }
++    return ctx->pass_len;
++}
++
++EVP_PKEY   *modssl_read_encrypted_pkey(const char *filename, EVP_PKEY **key, 
++                                       const char *pass, apr_size_t pass_len)
++{
++    pass_ctx ctx;
++    
++    ctx.pass = pass;
++    ctx.pass_len = pass_len;
++    return modssl_read_privatekey(filename, key, provide_pass, &ctx);
++}
++
+ /*  _________________________________________________________________
+ **
+ **  Smart shutdown
+Index: modules/ssl/ssl_util_ssl.h
+===================================================================
+--- modules/ssl/ssl_util_ssl.h	(revision 1808124)
++++ modules/ssl/ssl_util_ssl.h	(working copy)
+@@ -65,6 +65,7 @@
+ void       *modssl_get_app_data2(SSL *);
+ void        modssl_set_app_data2(SSL *, void *);
+ EVP_PKEY   *modssl_read_privatekey(const char *, EVP_PKEY **, pem_password_cb *, void *);
++EVP_PKEY   *modssl_read_encrypted_pkey(const char *, EVP_PKEY **, const char *, apr_size_t);
+ int         modssl_smart_shutdown(SSL *ssl);
+ BOOL        modssl_X509_getBC(X509 *, int *, int *);
+ char       *modssl_X509_NAME_ENTRY_to_string(apr_pool_t *p, X509_NAME_ENTRY *xsne);
diff --git a/www/mod_md-devel/files/patch-src_md__crypt.c b/www/mod_md-devel/files/patch-src_md__crypt.c
deleted file mode 100644
index d431ab5dbfa5..000000000000
--- a/www/mod_md-devel/files/patch-src_md__crypt.c
+++ /dev/null
@@ -1,437 +0,0 @@
---- src/md_crypt.c.orig	2017-08-09 13:30:59 UTC
-+++ src/md_crypt.c
-@@ -116,6 +116,425 @@ static void seed_RAND(int pid)
- 
- #endif /*ifdef MD_HAVE_ARC4RANDOM (else part) */
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+
-+/* Extracted from OpenSSL 1.0.2 */
-+
-+struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
-+{
-+    struct tm *ts = NULL;
-+
-+#if defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_VMS)
-+    {
-+        struct tm data, *ts2 = &data;
-+        if (gmtime_r(timer, ts2) == NULL)
-+            return NULL;
-+        memcpy(result, ts2, sizeof(struct tm));
-+        ts = result;
-+    }
-+#elif defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_MACOSX)
-+    if (gmtime_r(timer, result) == NULL)
-+        return NULL;
-+    ts = result;
-+#else
-+    ts = gmtime(timer);
-+    if (ts == NULL)
-+        return NULL;
-+
-+    memcpy(result, ts, sizeof(struct tm));
-+    ts = result;
-+#endif
-+    return ts;
-+}
-+
-+#define SECS_PER_DAY (24 * 60 * 60)
-+# define ASN1_STRING_FLAG_X509_TIME 0x100
-+
-+static int leap_year(const int year)
-+{
-+    if (year % 400 == 0 || (year % 100 != 0 && year % 4 == 0))
-+        return 1;
-+    return 0;
-+}
-+
-+/*
-+ * Compute the day of the week and the day of the year from the year, month
-+ * and day.  The day of the year is straightforward, the day of the week uses
-+ * a form of Zeller's congruence.  For this months start with March and are
-+ * numbered 4 through 15.
-+ */
-+static void determine_days(struct tm *tm)
-+{
-+    static const int ydays[12] = {
-+        0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
-+    };
-+    int y = tm->tm_year + 1900;
-+    int m = tm->tm_mon;
-+    int d = tm->tm_mday;
-+    int c;
-+
-+    tm->tm_yday = ydays[m] + d - 1;
-+    if (m >= 2) {
-+        /* March and onwards can be one day further into the year */
-+        tm->tm_yday += leap_year(y);
-+        m += 2;
-+    } else {
-+        /* Treat January and February as part of the previous year */
-+        m += 14;
-+        y--;
-+    }
-+    c = y / 100;
-+    y %= 100;
-+    /* Zeller's congruance */
-+    tm->tm_wday = (d + (13 * m) / 5 + y + y / 4 + c / 4 + 5 * c + 6) % 7;
-+}
-+
-+/*
-+ * Convert date to and from julian day Uses Fliegel & Van Flandern algorithm
-+ */
-+static long date_to_julian(int y, int m, int d)
-+{
-+    return (1461 * (y + 4800 + (m - 14) / 12)) / 4 +
-+        (367 * (m - 2 - 12 * ((m - 14) / 12))) / 12 -
-+        (3 * ((y + 4900 + (m - 14) / 12) / 100)) / 4 + d - 32075;
-+}
-+
-+static void julian_to_date(long jd, int *y, int *m, int *d)
-+{
-+    long L = jd + 68569;
-+    long n = (4 * L) / 146097;
-+    long i, j;
-+
-+    L = L - (146097 * n + 3) / 4;
-+    i = (4000 * (L + 1)) / 1461001;
-+    L = L - (1461 * i) / 4 + 31;
-+    j = (80 * L) / 2447;
-+    *d = L - (2447 * j) / 80;
-+    L = j / 11;
-+    *m = j + 2 - (12 * L);
-+    *y = 100 * (n - 49) + i + L;
-+}
-+
-+/* Convert tm structure and offset into julian day and seconds */
-+static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
-+                      long *pday, int *psec)
-+{
-+    int offset_hms, offset_day;
-+    long time_jd;
-+    int time_year, time_month, time_day;
-+    /* split offset into days and day seconds */
-+    offset_day = offset_sec / SECS_PER_DAY;
-+    /* Avoid sign issues with % operator */
-+    offset_hms = offset_sec - (offset_day * SECS_PER_DAY);
-+    offset_day += off_day;
-+    /* Add current time seconds to offset */
-+    offset_hms += tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
-+    /* Adjust day seconds if overflow */
-+    if (offset_hms >= SECS_PER_DAY) {
-+        offset_day++;
-+        offset_hms -= SECS_PER_DAY;
-+    } else if (offset_hms < 0) {
-+        offset_day--;
-+        offset_hms += SECS_PER_DAY;
-+    }
-+
-+    /*
-+     * Convert date of time structure into a Julian day number.
-+     */
-+
-+    time_year = tm->tm_year + 1900;
-+    time_month = tm->tm_mon + 1;
-+    time_day = tm->tm_mday;
-+
-+    time_jd = date_to_julian(time_year, time_month, time_day);
-+
-+    /* Work out Julian day of new date */
-+    time_jd += offset_day;
-+
-+    if (time_jd < 0)
-+        return 0;
-+
-+    *pday = time_jd;
-+    *psec = offset_hms;
-+    return 1;
-+}
-+
-+int OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
-+{
-+    int time_sec, time_year, time_month, time_day;
-+    long time_jd;
-+
-+    /* Convert time and offset into Julian day and seconds */
-+    if (!julian_adj(tm, off_day, offset_sec, &time_jd, &time_sec))
-+        return 0;
-+
-+    /* Convert Julian day back to date */
-+
-+    julian_to_date(time_jd, &time_year, &time_month, &time_day);
-+
-+    if (time_year < 1900 || time_year > 9999)
-+        return 0;
-+
-+    /* Update tm structure */
-+
-+    tm->tm_year = time_year - 1900;
-+    tm->tm_mon = time_month - 1;
-+    tm->tm_mday = time_day;
-+
-+    tm->tm_hour = time_sec / 3600;
-+    tm->tm_min = (time_sec / 60) % 60;
-+    tm->tm_sec = time_sec % 60;
-+
-+    return 1;
-+
-+}
-+
-+int OPENSSL_gmtime_diff(int *pday, int *psec,
-+                        const struct tm *from, const struct tm *to)
-+{
-+    int from_sec, to_sec, diff_sec;
-+    long from_jd, to_jd, diff_day;
-+    if (!julian_adj(from, 0, 0, &from_jd, &from_sec))
-+        return 0;
-+    if (!julian_adj(to, 0, 0, &to_jd, &to_sec))
-+        return 0;
-+    diff_day = to_jd - from_jd;
-+    diff_sec = to_sec - from_sec;
-+    /* Adjust differences so both positive or both negative */
-+    if (diff_day > 0 && diff_sec < 0) {
-+        diff_day--;
-+        diff_sec += SECS_PER_DAY;
-+    }
-+    if (diff_day < 0 && diff_sec > 0) {
-+        diff_day++;
-+        diff_sec -= SECS_PER_DAY;
-+    }
-+
-+    if (pday)
-+        *pday = (int)diff_day;
-+    if (psec)
-+        *psec = diff_sec;
-+
-+    return 1;
-+
-+}
-+
-+int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d)
-+{
-+    static const int min[9] = { 0, 0, 1, 1, 0, 0, 0, 0, 0 };
-+    static const int max[9] = { 99, 99, 12, 31, 23, 59, 59, 12, 59 };
-+    static const int mdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-+    char *a;
-+    int n, i, i2, l, o, min_l = 11, strict = 0, end = 6, btz = 5, md;
-+    struct tm tmp;
-+
-+    /*
-+     * ASN1_STRING_FLAG_X509_TIME is used to enforce RFC 5280
-+     * time string format, in which:
-+     *
-+     * 1. "seconds" is a 'MUST'
-+     * 2. "Zulu" timezone is a 'MUST'
-+     * 3. "+|-" is not allowed to indicate a time zone
-+     */
-+    if (d->type == V_ASN1_UTCTIME) {
-+        if (d->flags & ASN1_STRING_FLAG_X509_TIME) {
-+            min_l = 13;
-+            strict = 1;
-+        }
-+    } else if (d->type == V_ASN1_GENERALIZEDTIME) {
-+        end = 7;
-+        btz = 6;
-+        if (d->flags & ASN1_STRING_FLAG_X509_TIME) {
-+            min_l = 15;
-+            strict = 1;
-+        } else {
-+            min_l = 13;
-+        }
-+    } else {
-+        return 0;
-+    }
-+
-+    l = d->length;
-+    a = (char *)d->data;
-+    o = 0;
-+    memset(&tmp, 0, sizeof(tmp));
-+
-+    /*
-+     * GENERALIZEDTIME is similar to UTCTIME except the year is represented
-+     * as YYYY. This stuff treats everything as a two digit field so make
-+     * first two fields 00 to 99
-+     */
-+
-+    if (l < min_l)
-+        goto err;
-+    for (i = 0; i < end; i++) {
-+        if (!strict && (i == btz) && ((a[o] == 'Z') || (a[o] == '+') || (a[o] == '-'))) {
-+            i++;
-+            break;
-+        }
-+        if (!isdigit(a[o]))
-+            goto err;
-+        n = a[o] - '0';
-+        /* incomplete 2-digital number */
-+        if (++o == l)
-+            goto err;
-+
-+        if (!isdigit(a[o]))
-+            goto err;
-+        n = (n * 10) + a[o] - '0';
-+        /* no more bytes to read, but we haven't seen time-zone yet */
-+        if (++o == l)
-+            goto err;
-+
-+        i2 = (d->type == V_ASN1_UTCTIME) ? i + 1 : i;
-+
-+        if ((n < min[i2]) || (n > max[i2]))
-+            goto err;
-+        switch (i2) {
-+        case 0:
-+            /* UTC will never be here */
-+            tmp.tm_year = n * 100 - 1900;
-+            break;
-+        case 1:
-+            if (d->type == V_ASN1_UTCTIME)
-+                tmp.tm_year = n < 50 ? n + 100 : n;
-+            else
-+                tmp.tm_year += n;
-+            break;
-+        case 2:
-+            tmp.tm_mon = n - 1;
-+            break;
-+        case 3:
-+            /* check if tm_mday is valid in tm_mon */
-+            if (tmp.tm_mon == 1) {
-+                /* it's February */
-+                md = mdays[1] + leap_year(tmp.tm_year + 1900);
-+            } else {
-+                md = mdays[tmp.tm_mon];
-+            }
-+            if (n > md)
-+                goto err;
-+            tmp.tm_mday = n;
-+            determine_days(&tmp);
-+            break;
-+        case 4:
-+            tmp.tm_hour = n;
-+            break;
-+        case 5:
-+            tmp.tm_min = n;
-+            break;
-+        case 6:
-+            tmp.tm_sec = n;
-+            break;
-+        }
-+    }
-+
-+    /*
-+     * Optional fractional seconds: decimal point followed by one or more
-+     * digits.
-+     */
-+    if (d->type == V_ASN1_GENERALIZEDTIME && a[o] == '.') {
-+        if (strict)
-+            /* RFC 5280 forbids fractional seconds */
-+            goto err;
-+        if (++o == l)
-+            goto err;
-+        i = o;
-+        while ((o < l) && isdigit(a[o]))
-+            o++;
-+        /* Must have at least one digit after decimal point */
-+        if (i == o)
-+            goto err;
-+        /* no more bytes to read, but we haven't seen time-zone yet */
-+        if (o == l)
-+            goto err;
-+    }
-+
-+    /*
-+     * 'o' will never point to '\0' at this point, the only chance
-+     * 'o' can point to '\0' is either the subsequent if or the first
-+     * else if is true.
-+     */
-+    if (a[o] == 'Z') {
-+        o++;
-+    } else if (!strict && ((a[o] == '+') || (a[o] == '-'))) {
-+        int offsign = a[o] == '-' ? 1 : -1;
-+        int offset = 0;
-+
-+        o++;
-+        /*
-+         * if not equal, no need to do subsequent checks
-+         * since the following for-loop will add 'o' by 4
-+         * and the final return statement will check if 'l'
-+         * and 'o' are equal.
-+         */
-+        if (o + 4 != l)
-+            goto err;
-+        for (i = end; i < end + 2; i++) {
-+            if (!isdigit(a[o]))
-+                goto err;
-+            n = a[o] - '0';
-+            o++;
-+            if (!isdigit(a[o]))
-+                goto err;
-+            n = (n * 10) + a[o] - '0';
-+            i2 = (d->type == V_ASN1_UTCTIME) ? i + 1 : i;
-+            if ((n < min[i2]) || (n > max[i2]))
-+                goto err;
-+            /* if tm is NULL, no need to adjust */
-+            if (tm != NULL) {
-+                if (i == end)
-+                    offset = n * 3600;
-+                else if (i == end + 1)
-+                    offset += n * 60;
-+            }
-+            o++;
-+        }
-+        if (offset && !OPENSSL_gmtime_adj(&tmp, 0, offset * offsign))
-+            goto err;
-+    } else {
-+        /* not Z, or not +/- in non-strict mode */
-+        goto err;
-+    }
-+    if (o == l) {
-+        /* success, check if tm should be filled */
-+        if (tm != NULL)
-+            *tm = tmp;
-+        return 1;
-+    }
-+ err:
-+    return 0;
-+}
-+
-+int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm)
-+{
-+    if (s == NULL) {
-+        time_t now_t;
-+
-+        time(&now_t);
-+        memset(tm, 0, sizeof(*tm));
-+        if (OPENSSL_gmtime(&now_t, tm) != NULL)
-+            return 1;
-+        return 0;
-+    }
-+
-+    return asn1_time_to_tm(tm, s);
-+}
-+
-+int ASN1_TIME_diff(int *pday, int *psec,
-+                   const ASN1_TIME *from, const ASN1_TIME *to)
-+{
-+    struct tm tm_from, tm_to;
-+
-+    if (!ASN1_TIME_to_tm(from, &tm_from))
-+        return 0;
-+    if (!ASN1_TIME_to_tm(to, &tm_to))
-+        return 0;
-+    return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);
-+}
-+
-+#endif /*ifdef LIBRESSL_VERSION_NUMBER*/
-+
- 
- apr_status_t md_crypt_init(apr_pool_t *pool)
- {
-@@ -328,7 +747,7 @@ apr_status_t md_pkey_gen_rsa(md_pkey_t *
-     return rv;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifndef NID_tlsfeature
- #define NID_tlsfeature          1020
diff --git a/www/mod_md-devel/pkg-message b/www/mod_md-devel/pkg-message
index 8778a6773050..a78c2f3a0a64 100644
--- a/www/mod_md-devel/pkg-message
+++ b/www/mod_md-devel/pkg-message
@@ -1,6 +1,18 @@
-/!\ This is an early experience non-production-ready version /!\
+/!\   This is an early experience non-production-ready version   /!\
 
-If you want to have the h2 module enabled in your apache installation,
+####################################################################
+# This module requires a patched Apache mod_ssl. Apply the mod_ssl #
+# patch from https://github.com/icing/mod_md/tree/master/patches   #
+# to the www/apache24 port and rebuild/reinstall apache.           #
+####################################################################
+
+Add the following to your make.conf to apply the patch to www/apache24
+
+.if ${.CURDIR:M*/www/apache24}
+EXTRA_PATCHES+=../mod_md-devel/files/extra-patch-mod_ssl
+.endif
+
+If you want to have the md module enabled in your apache installation,
 you need to add
 
    LoadModule md_module modules/mod_md.so
@@ -11,3 +23,5 @@ somewhere in your config files and add a line like
 
 Full documentation in the project's wiki 
 	https://github.com/icing/mod_md/wiki
+and for most directives in Apache trunk documentation
+	https://httpd.apache.org/docs/trunk/mod/mod_md.html
diff --git a/www/mod_security-devel/Makefile b/www/mod_security-devel/Makefile
index bbfcd9c56ff0..5696e76f748a 100644
--- a/www/mod_security-devel/Makefile
+++ b/www/mod_security-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mod_security-devel
 PORTVERSION=	3.0.0.g2017080200
+PORTREVISION=	1
 CATEGORIES=	www security
 
 MAINTAINER=	marius.halden@modirum.com
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index 6ca0f87a8cec..ea164e0df1dd 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_spdy
 PORTVERSION=	0.9.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \
 		APACHE_HTTPD:apache22
diff --git a/www/mod_wsgi4/Makefile b/www/mod_wsgi4/Makefile
index d574aca6eee7..5ce5b922bcf8 100644
--- a/www/mod_wsgi4/Makefile
+++ b/www/mod_wsgi4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_wsgi
-PORTVERSION=	4.5.17
+PORTVERSION=	4.5.18
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_wsgi4/distinfo b/www/mod_wsgi4/distinfo
index 73fcede53c6f..ca737859962e 100644
--- a/www/mod_wsgi4/distinfo
+++ b/www/mod_wsgi4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499543940
-SHA256 (mod_wsgi-4.5.17.tar.gz) = 591779c49deeec1852e99ffe43ca1f3b09de19645de656e9b05320383ca8c251
-SIZE (mod_wsgi-4.5.17.tar.gz) = 1852139
+TIMESTAMP = 1504983813
+SHA256 (mod_wsgi-4.5.18.tar.gz) = 5889bf48b3833aae460b2526ab0c6f3ce85ddc933bb13902242a346b6ceed7f0
+SIZE (mod_wsgi-4.5.18.tar.gz) = 2542664
diff --git a/www/moodle31/Makefile b/www/moodle31/Makefile
index f15e8824ce68..dcb941f96124 100644
--- a/www/moodle31/Makefile
+++ b/www/moodle31/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.1.7
+PORTVERSION=	3.1.8
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable31/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
diff --git a/www/moodle31/distinfo b/www/moodle31/distinfo
index dfcfbf693d51..d39daa46b71e 100644
--- a/www/moodle31/distinfo
+++ b/www/moodle31/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499734874
-SHA256 (moodle-3.1.7.tgz) = 927d41d070d6703ba98b312a261da84f603f16c8da4e8ac34c049c7785451284
-SIZE (moodle-3.1.7.tgz) = 37982099
+TIMESTAMP = 1505228130
+SHA256 (moodle-3.1.8.tgz) = 5209cdda1eaf3f88eb7e9eb852217ad5918607077251dab7fe29f088c76db35d
+SIZE (moodle-3.1.8.tgz) = 38015937
diff --git a/www/moodle32/Makefile b/www/moodle32/Makefile
index 2f53c3ac8d90..edfc08f6efad 100644
--- a/www/moodle32/Makefile
+++ b/www/moodle32/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.2.4
+PORTVERSION=	3.2.5
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable32/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
diff --git a/www/moodle32/distinfo b/www/moodle32/distinfo
index 39c840b4da75..5bab0979e125 100644
--- a/www/moodle32/distinfo
+++ b/www/moodle32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499729939
-SHA256 (moodle-3.2.4.tgz) = 5f743bc389582bd8e0f5878d745cf23472fe97b9e7de459dfe42483844f42385
-SIZE (moodle-3.2.4.tgz) = 39525148
+TIMESTAMP = 1505227764
+SHA256 (moodle-3.2.5.tgz) = 53a381988fc0aa0169c4e2af2364406614bc3cf0948631a1f3008df3ccbfa3c4
+SIZE (moodle-3.2.5.tgz) = 39902419
diff --git a/www/moodle33/Makefile b/www/moodle33/Makefile
index 5f46b409af4c..ec8d18e4ec65 100644
--- a/www/moodle33/Makefile
+++ b/www/moodle33/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.3.1
+PORTVERSION=	3.3.2
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable33/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
diff --git a/www/moodle33/distinfo b/www/moodle33/distinfo
index 12c11c6ee6db..90d9b7e0eaa8 100644
--- a/www/moodle33/distinfo
+++ b/www/moodle33/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499729705
-SHA256 (moodle-3.3.1.tgz) = 9c7069a4d46134972ae50f75bae4f25d60ea75603dfaff5fb5f1306fee70daf0
-SIZE (moodle-3.3.1.tgz) = 43790252
+TIMESTAMP = 1505227359
+SHA256 (moodle-3.3.2.tgz) = 1a34c8e85d05bb693a1f4f5e70b63f527cac655101236ab1e474aa295843fbf1
+SIZE (moodle-3.3.2.tgz) = 44171663
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index b209f5973414..8d95ee1a133c 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	newsbeuter
 PORTVERSION=	2.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	https://newsbeuter.org/downloads/ \
 		http://newsbeuter.org/downloads/
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index b1c3e93fddb7..f96dafd6b97f 100644
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nghttp2
 PORTVERSION=	1.25.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www net
 
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index a3bcb3cfd350..49278f81c10a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.13.4
+PORTVERSION=	1.13.5
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -917,7 +917,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.5
+PASSENGER_VERSION=	5.1.8
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if !empty(PORT_OPTIONS:MDSO)
@@ -1064,7 +1064,7 @@ CONFIGURE_ARGS+=--with-http_v2_module
 .if ${PORT_OPTIONS:MNJS}
 GH_ACCOUNT+=	nginx:njs
 GH_PROJECT+=	njs:njs
-GH_TAGNAME+=	753ebe6:njs
+GH_TAGNAME+=	bd40aea:njs
 .if !empty(PORT_OPTIONS:MDSO)
 CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx
 .else
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7e5961f86ad3..d2c94826f75c 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1502363751
-SHA256 (nginx-1.13.4.tar.gz) = de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba
-SIZE (nginx-1.13.4.tar.gz) = 988415
+TIMESTAMP = 1504807697
+SHA256 (nginx-1.13.5.tar.gz) = 0e75b94429b3f745377aeba3aff97da77bf2b03fcb9ff15b3bad9b038db29f2e
+SIZE (nginx-1.13.5.tar.gz) = 988821
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546c
 SIZE (08a395c66e42.tar.gz) = 120603
 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
 SIZE (modsecurity-2.9.1.tar.gz) = 4261212
-SHA256 (passenger-5.1.5.tar.gz) = ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47
-SIZE (passenger-5.1.5.tar.gz) = 5126337
+SHA256 (passenger-5.1.8.tar.gz) = fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d
+SIZE (passenger-5.1.8.tar.gz) = 5234529
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
@@ -121,8 +121,8 @@ SHA256 (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = cba0673725f66279671d9dc0ac7b
 SIZE (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = 388548
 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
 SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
-SHA256 (nginx-njs-753ebe6_GH0.tar.gz) = 43fc7a307ee98b9c55283374b36f1f4576cbf529a4101176cb94ab73f3110f67
-SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
+SHA256 (nginx-njs-bd40aea_GH0.tar.gz) = 0fea9022d79db2b74d2da1b44f6366a3c60fe47475b77a80c506ef02ad976151
+SIZE (nginx-njs-bd40aea_GH0.tar.gz) = 203897
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
 SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index 26357885527f..65a7a1a2d462 100644
--- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-5.1.5/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.5/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.1.8/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.1.8/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index e36b38ff4de6..edd4b1a4a085 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -933,7 +933,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.5
+PASSENGER_VERSION=	5.1.8
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if !empty(PORT_OPTIONS:MDSO)
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index af76f79eeb0d..9ef2a0a2afc6 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1501239413
+TIMESTAMP = 1504807697
 SHA256 (nginx-1.12.1.tar.gz) = 8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb
 SIZE (nginx-1.12.1.tar.gz) = 981093
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -17,8 +17,8 @@ SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cd
 SIZE (modsecurity-2.9.1.tar.gz) = 4261212
 SHA256 (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 3d216e7c282213cd64b4671fe86d9057a3f318f692f4f906c695eee619c82228
 SIZE (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 25917
-SHA256 (passenger-5.1.5.tar.gz) = ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47
-SIZE (passenger-5.1.5.tar.gz) = 5126337
+SHA256 (passenger-5.1.8.tar.gz) = fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d
+SIZE (passenger-5.1.8.tar.gz) = 5234529
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 26357885527f..65a7a1a2d462 100644
--- a/www/nginx/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-5.1.5/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.5/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.1.8/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.1.8/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/node/Makefile b/www/node/Makefile
index d74edee91948..2c735d86261b 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	8.4.0
+PORTVERSION=	8.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
diff --git a/www/node/distinfo b/www/node/distinfo
index ab6eb0654e8a..9aeeb5a63871 100644
--- a/www/node/distinfo
+++ b/www/node/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502897455
-SHA256 (node-v8.4.0.tar.gz) = 641a15fa822710ef2dc99793fec48d2a8ef75de0040b86568563d4ab296137ef
-SIZE (node-v8.4.0.tar.gz) = 30975247
+TIMESTAMP = 1505392444
+SHA256 (node-v8.5.0.tar.gz) = dd5ac97074882ba62892bdb91ec5e624c338d772a6218da08c182231031a4446
+SIZE (node-v8.5.0.tar.gz) = 31094898
diff --git a/www/node4/Makefile b/www/node4/Makefile
index a6f6f4206e33..f05f0c94b70f 100644
--- a/www/node4/Makefile
+++ b/www/node4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	node
 PORTVERSION=	4.8.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
diff --git a/www/node4/files/patch-deps_v8_src_runtime_runtime-i18n.cc b/www/node4/files/patch-deps_v8_src_runtime_runtime-i18n.cc
new file mode 100644
index 000000000000..6d9273bdc111
--- /dev/null
+++ b/www/node4/files/patch-deps_v8_src_runtime_runtime-i18n.cc
@@ -0,0 +1,10 @@
+--- deps/v8/src/runtime/runtime-i18n.cc.orig	2017-07-11 01:49:24 UTC
++++ deps/v8/src/runtime/runtime-i18n.cc
+@@ -22,6 +22,7 @@
+ #include "unicode/dtfmtsym.h"
+ #include "unicode/dtptngen.h"
+ #include "unicode/locid.h"
++#include "unicode/normlzr.h"
+ #include "unicode/numfmt.h"
+ #include "unicode/numsys.h"
+ #include "unicode/rbbi.h"
diff --git a/www/node6/Makefile b/www/node6/Makefile
index e146f2142766..99f70d1a05db 100644
--- a/www/node6/Makefile
+++ b/www/node6/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	6.11.2
+PORTVERSION=	6.11.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
@@ -33,6 +33,8 @@ BUNDLED_SSL_CONFIGURE_OFF+=	--shared-openssl
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
+DTRACE_CONFIGURE_ON=	--with-dtrace
+
 USES=		compiler:c++11-lib execinfo gmake python:2,build pkgconfig \
 		localbase shebangfix
 
@@ -83,10 +85,6 @@ CONFIGURE_ARGS+=--openssl-no-asm
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=	--with-dtrace
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
diff --git a/www/node6/distinfo b/www/node6/distinfo
index 47f88ed1cdae..ce51830ba112 100644
--- a/www/node6/distinfo
+++ b/www/node6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502041223
-SHA256 (node-v6.11.2.tar.gz) = 20146ed51b638404665737ed8a25cc06e96d7d7259eb90a4bdec4730a78002a6
-SIZE (node-v6.11.2.tar.gz) = 26844771
+TIMESTAMP = 1504848990
+SHA256 (node-v6.11.3.tar.gz) = c60562a7bc316f137297b7aa23ae354e3ac6779fe8ddf46fe43a75b6b92443e8
+SIZE (node-v6.11.3.tar.gz) = 26875258
diff --git a/www/node6/files/patch-node.gyp b/www/node6/files/patch-node.gyp
deleted file mode 100644
index 34a0c8825c1a..000000000000
--- a/www/node6/files/patch-node.gyp
+++ /dev/null
@@ -1,15 +0,0 @@
---- node.gyp.orig	2017-05-10 12:20:05 UTC
-+++ node.gyp
-@@ -818,6 +818,12 @@
-                 '<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
-               ],
-               'conditions': [
-+                [ 'target_arch=="arm"', {
-+                  'action': [
-+                    'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
-+                    '-C', '-G', '-s', 'src/v8ustack.d', '-o', '<@(_outputs)',
-+                  ]
-+                } ],
-                 [ 'target_arch=="ia32"', {
-                   'action': [
-                     'dtrace', '-32', '-I<(SHARED_INTERMEDIATE_DIR)', '-Isrc',
diff --git a/www/novnc-websockify/Makefile b/www/novnc-websockify/Makefile
new file mode 100644
index 000000000000..1981ac38ada6
--- /dev/null
+++ b/www/novnc-websockify/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+PORTNAME=	websockify
+PORTVERSION=	0.8.0
+CATEGORIES=	www
+
+MAINTAINER=	araujo@FreeBSD.org
+COMMENT=	noVNC-websockify implementation.
+
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	novnc>0:www/novnc
+
+USES=		shebangfix python
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	novnc
+GH_PROJECT=	websockify
+GH_TAGNAME=	1f132f9
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+TARGET_DIR=	${PREFIX}/libexec/novnc/utils/websockify
+
+do-install:
+	${MKDIR} ${TARGET_DIR}
+	cd ${WRKSRC} && ${RM} .gitignore .gitmodules .travis.yml
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TARGET_DIR}
+	@${CHMOD} +x ${STAGEDIR}${TARGET_DIR}/run
+	@${CHMOD} +x ${STAGEDIR}${TARGET_DIR}/rebind
+
+.include <bsd.port.mk>
diff --git a/www/novnc-websockify/distinfo b/www/novnc-websockify/distinfo
new file mode 100644
index 000000000000..aff2bfc9a0a6
--- /dev/null
+++ b/www/novnc-websockify/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504695059
+SHA256 (novnc-websockify-0.8.0-1f132f9_GH0.tar.gz) = f67d27fdf8dcf7f92bb7f22b5d78ebf5369f71f3bc1ee3084a17ef90b356e93f
+SIZE (novnc-websockify-0.8.0-1f132f9_GH0.tar.gz) = 288383
diff --git a/www/novnc-websockify/pkg-descr b/www/novnc-websockify/pkg-descr
new file mode 100644
index 000000000000..667a1134b71c
--- /dev/null
+++ b/www/novnc-websockify/pkg-descr
@@ -0,0 +1,8 @@
+Websockify is a WebSocket to TCP proxy/bridge.
+This allows a browser to connect to any application/server/service.
+Implementations in Python, C, Node.js and Ruby.
+
+It also includes a wrap program that uses a LD_PRELOAD library to
+proxying from a source address to a target address.
+
+WWW: https://github.com/novnc/websockify
diff --git a/www/novnc-websockify/pkg-plist b/www/novnc-websockify/pkg-plist
new file mode 100644
index 000000000000..f0b426a6dbea
--- /dev/null
+++ b/www/novnc-websockify/pkg-plist
@@ -0,0 +1,82 @@
+libexec/novnc/utils/websockify/CHANGES.txt
+libexec/novnc/utils/websockify/LICENSE.txt
+libexec/novnc/utils/websockify/MANIFEST.in
+libexec/novnc/utils/websockify/Makefile
+libexec/novnc/utils/websockify/README.md
+libexec/novnc/utils/websockify/Windows/Windows Service Readme.txt
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj
+libexec/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln
+libexec/novnc/utils/websockify/docs/LICENSE.GPL-3
+libexec/novnc/utils/websockify/docs/LICENSE.LGPL-3
+libexec/novnc/utils/websockify/docs/LICENSE.MPL-2.0
+libexec/novnc/utils/websockify/docs/TODO
+libexec/novnc/utils/websockify/docs/flash_policy.txt
+libexec/novnc/utils/websockify/docs/latency_results.txt
+libexec/novnc/utils/websockify/docs/notes
+libexec/novnc/utils/websockify/docs/release.txt
+libexec/novnc/utils/websockify/docs/websockify.1
+libexec/novnc/utils/websockify/include/VT100.js
+libexec/novnc/utils/websockify/include/base64.js
+libexec/novnc/utils/websockify/include/keysym.js
+libexec/novnc/utils/websockify/include/util.js
+libexec/novnc/utils/websockify/include/web-socket-js/README.txt
+libexec/novnc/utils/websockify/include/web-socket-js/WebSocketMain.swf
+libexec/novnc/utils/websockify/include/web-socket-js/swfobject.js
+libexec/novnc/utils/websockify/include/web-socket-js/web_socket.js
+libexec/novnc/utils/websockify/include/websock.js
+libexec/novnc/utils/websockify/include/webutil.js
+libexec/novnc/utils/websockify/include/wsirc.js
+libexec/novnc/utils/websockify/include/wstelnet.js
+libexec/novnc/utils/websockify/other/Makefile
+libexec/novnc/utils/websockify/other/README.md
+libexec/novnc/utils/websockify/other/js/README.md
+libexec/novnc/utils/websockify/other/js/package.json
+libexec/novnc/utils/websockify/other/js/websockify.js
+libexec/novnc/utils/websockify/other/launch.sh
+libexec/novnc/utils/websockify/other/project.clj
+libexec/novnc/utils/websockify/other/websocket.c
+libexec/novnc/utils/websockify/other/websocket.h
+libexec/novnc/utils/websockify/other/websocket.rb
+libexec/novnc/utils/websockify/other/websockify.c
+libexec/novnc/utils/websockify/other/websockify.clj
+libexec/novnc/utils/websockify/other/websockify.rb
+libexec/novnc/utils/websockify/other/wswrap
+libexec/novnc/utils/websockify/rebind
+libexec/novnc/utils/websockify/rebind.c
+libexec/novnc/utils/websockify/run
+libexec/novnc/utils/websockify/setup.py
+libexec/novnc/utils/websockify/test-requirements.txt
+libexec/novnc/utils/websockify/tests/b64_vs_utf8.py
+libexec/novnc/utils/websockify/tests/base64.html
+libexec/novnc/utils/websockify/tests/base64.js
+libexec/novnc/utils/websockify/tests/echo.html
+libexec/novnc/utils/websockify/tests/echo.py
+libexec/novnc/utils/websockify/tests/echo.rb
+libexec/novnc/utils/websockify/tests/include
+libexec/novnc/utils/websockify/tests/latency.html
+libexec/novnc/utils/websockify/tests/latency.py
+libexec/novnc/utils/websockify/tests/load.html
+libexec/novnc/utils/websockify/tests/load.py
+libexec/novnc/utils/websockify/tests/plain_echo.html
+libexec/novnc/utils/websockify/tests/simple.html
+libexec/novnc/utils/websockify/tests/test_auth_plugins.py
+libexec/novnc/utils/websockify/tests/test_websocket.py
+libexec/novnc/utils/websockify/tests/test_websocketproxy.py
+libexec/novnc/utils/websockify/tests/utf8-list.py
+libexec/novnc/utils/websockify/tox.ini
+libexec/novnc/utils/websockify/websockify.py
+libexec/novnc/utils/websockify/websockify/__init__.py
+libexec/novnc/utils/websockify/websockify/auth_plugins.py
+libexec/novnc/utils/websockify/websockify/token_plugins.py
+libexec/novnc/utils/websockify/websockify/websocket.py
+libexec/novnc/utils/websockify/websockify/websocketproxy.py
+libexec/novnc/utils/websockify/wsirc.html
+libexec/novnc/utils/websockify/wstelnet.html
+@dir libexec/novnc/utils/websockify/include/web-socket-js-project
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index 0721f2bb492f..a1ce541d1a9b 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	otter-browser
 PORTVERSION=	0.9.12
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index 5b01ae662904..e23579211cd5 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk2-WebKit
 PORTVERSION=	0.09
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FLORA
diff --git a/www/p5-Mojo-IOLoop-ForkCall/Makefile b/www/p5-Mojo-IOLoop-ForkCall/Makefile
new file mode 100644
index 000000000000..d6b2065cf711
--- /dev/null
+++ b/www/p5-Mojo-IOLoop-ForkCall/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME=		Mojo-IOLoop-ForkCall
+PORTVERSION=		0.17
+CATEGORIES=		www perl5
+MASTER_SITES=		CPAN
+MASTER_SITE_SUBDIR=	CPAN:JBERGER
+PKGNAMEPREFIX=		p5-
+
+MAINTAINER=		skalmanman@gmail.com
+COMMENT=		Mojo::IOLoop::ForkCall
+
+LICENSE=		ART10 GPLv1
+LICENSE_COMB=		dual
+
+RUN_DEPENDS=		p5-Mojolicious>=5.08:www/p5-Mojolicious \
+			p5-IO-Pipely>=0.005:devel/p5-IO-Pipely \
+			p5-Perl-OSType>=0:devel/p5-Perl-OSType
+
+USES=			perl5
+USE_PERL5=		modbuild
+PL_BUILD=		Build
+
+.include <bsd.port.mk>
diff --git a/www/p5-Mojo-IOLoop-ForkCall/distinfo b/www/p5-Mojo-IOLoop-ForkCall/distinfo
new file mode 100644
index 000000000000..0c15c912c6b9
--- /dev/null
+++ b/www/p5-Mojo-IOLoop-ForkCall/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1492388886
+SHA256 (Mojo-IOLoop-ForkCall-0.17.tar.gz) = 886de5c3b44194a86228471075fac4036073bda19093e776c702aa65c3ef1824
+SIZE (Mojo-IOLoop-ForkCall-0.17.tar.gz) = 12158
diff --git a/www/p5-Mojo-IOLoop-ForkCall/pkg-descr b/www/p5-Mojo-IOLoop-ForkCall/pkg-descr
new file mode 100644
index 000000000000..ed65b0bc8e87
--- /dev/null
+++ b/www/p5-Mojo-IOLoop-ForkCall/pkg-descr
@@ -0,0 +1,3 @@
+Mojo::IOLoop::ForkCall - run blocking functions asynchronously by forking 
+
+WWW: http://search.cpan.org/dist/Mojo-IOLoop-ForkCall/
diff --git a/www/p5-Mojo-IOLoop-ForkCall/pkg-plist b/www/p5-Mojo-IOLoop-ForkCall/pkg-plist
new file mode 100644
index 000000000000..7c15991d8a28
--- /dev/null
+++ b/www/p5-Mojo-IOLoop-ForkCall/pkg-plist
@@ -0,0 +1,4 @@
+%%SITE_PERL%%/Mojo/IOLoop/ForkCall.pm
+%%SITE_PERL%%/Mojolicious/Plugin/ForkCall.pm
+%%PERL5_MAN3%%/Mojo::IOLoop::ForkCall.3.gz
+%%PERL5_MAN3%%/Mojolicious::Plugin::ForkCall.3.gz
diff --git a/www/p5-WWW-Salesforce/Makefile b/www/p5-WWW-Salesforce/Makefile
index 7a51afd14791..64b8beeaed1c 100644
--- a/www/p5-WWW-Salesforce/Makefile
+++ b/www/p5-WWW-Salesforce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=       WWW-Salesforce
-PORTVERSION=    0.25
+PORTVERSION=    0.301
 CATEGORIES=     www perl5
 MASTER_SITES=   CPAN
 PKGNAMEPREFIX=  p5-
diff --git a/www/p5-WWW-Salesforce/distinfo b/www/p5-WWW-Salesforce/distinfo
index b006686171a8..f4d87283b979 100644
--- a/www/p5-WWW-Salesforce/distinfo
+++ b/www/p5-WWW-Salesforce/distinfo
@@ -1,2 +1,3 @@
-SHA256 (WWW-Salesforce-0.25.tar.gz) = a96916cc67212bf382942adac003d0f65c5fd3e77f038b3b9670ebc001de0e5f
-SIZE (WWW-Salesforce-0.25.tar.gz) = 29085
+TIMESTAMP = 1505369675
+SHA256 (WWW-Salesforce-0.301.tar.gz) = 427935a81893fbae9c1b77b95d8451b26320d322655a50d739719332b43c8d7f
+SIZE (WWW-Salesforce-0.301.tar.gz) = 48658
diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile
index e0d4e138d748..489b5137db06 100644
--- a/www/phpvirtualbox/Makefile
+++ b/www/phpvirtualbox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	phpvirtualbox
 DISTVERSION=	5.1-1
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	vbox@FreeBSD.org
diff --git a/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php b/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php
index 62e25baf1be8..10101575344c 100644
--- a/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php
+++ b/www/phpvirtualbox/files/patch-endpoints_lib_vboxconnector.php
@@ -5,7 +5,7 @@
  			foreach($checks as $iso) {
  				try {
 -					$gem = $this->vbox->openMedium($iso,'DVD','ReadOnly');
-+					$gem = $this->vbox->openMedium($iso,'DVD','ReadOnly',null);
++					$gem = $this->vbox->openMedium($iso,'DVD','ReadOnly',false);
  					break;
  				} catch (Exception $e) {
  					// Ignore
@@ -23,7 +23,7 @@
  								}
  							} else {
 -								$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type']);
-+								$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],null,null);
++								$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],'ReadWrite',false);
  							}
  						} else {
  							$med = null;
@@ -36,12 +36,21 @@
  				$eprops = array_combine($eprops[1],$eprops[0]);
  				$iprops = array_map(create_function('$a','$b=explode("=",$a); return array($b[0]=>$b[1]);'),preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties']));
  				$inprops = array();
+@@ -1942,7 +1942,7 @@ class vboxconnector {
+ 			if($args['bootOrder'][$i]) {
+ 				$m->setBootOrder(($i + 1),$args['bootOrder'][$i]);
+ 			} else {
+-				$m->setBootOrder(($i + 1),null);
++				$m->setBootOrder(($i + 1),'Null');
+ 			}
+ 		}
+ 
 @@ -2028,7 +2028,7 @@ class vboxconnector {
  						}
  					} else {
  						/* @var $med IMedium */
 -						$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type']);
-+						$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],null,null);
++						$med = $this->vbox->openMedium($ma['medium']['location'],$ma['type'],'ReadWrite',false);
  					}
  				} else {
  					$med = null;
@@ -68,7 +77,7 @@
  			$delete = $machine->unregister('DetachAllReturnHardDisksOnly');
  			foreach($delete as $hd) {
 -				$hds[] = $this->vbox->openMedium($hd->location,'HardDisk')->handle;
-+				$hds[] = $this->vbox->openMedium($hd->location,'HardDisk',null,null)->handle;
++				$hds[] = $this->vbox->openMedium($hd->location,'HardDisk','ReadWrite',false)->handle;
  			}
  
  			/* @var $progress IProgress */
@@ -86,7 +95,7 @@
  				$sc->releaseRemote();
  
 -				$m = $this->vbox->openMedium($args['disk'],'HardDisk');
-+				$m = $this->vbox->openMedium($args['disk'],'HardDisk',null,null);
++				$m = $this->vbox->openMedium($args['disk'],'HardDisk','ReadWrite',false);
  
  				$this->session->machine->attachDevice(trans($HDbusType,'UIMachineSettingsStorage'),0,0,'HardDisk',$m->handle);
  
@@ -113,7 +122,7 @@
  
  			/* @var $progress IProgress */
 -			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description']);
-+			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description'],null);
++			list($progress, $snapshotId) = $this->session->machine->takeSnapshot($args['name'], $args['description'], null);
  
  			// Does an exception exist?
  			try {
@@ -122,7 +131,7 @@
  	    $this->connect();
  
 -	    $m = $this->vbox->openMedium($args['medium'],'HardDisk');
-+	    $m = $this->vbox->openMedium($args['medium'],'HardDisk',null,null);
++	    $m = $this->vbox->openMedium($args['medium'],'HardDisk','ReadWrite',false);
  
  	    $retval = $m->checkEncryptionPassword($args['password']);
  
@@ -131,7 +140,7 @@
  	    $this->connect();
  
 -	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite');
-+	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite',null);
++	    $m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
  
  	    /* @var $progress IProgress */
  	    $progress = $m->changeEncryption($args['old_password'],
@@ -140,7 +149,7 @@
  		$this->connect();
  
 -		$m = $this->vbox->openMedium($args['medium'], 'HardDisk');
-+		$m = $this->vbox->openMedium($args['medium'], 'HardDisk',null,null);
++		$m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
  
  		/* @var $progress IProgress */
  		$progress = $m->resize($args['bytes']);
@@ -149,7 +158,7 @@
  
  		/* @var $src IMedium */
 -		$src = $this->vbox->openMedium($args['src'], 'HardDisk');
-+		$src = $this->vbox->openMedium($args['src'], 'HardDisk',null,null);
++		$src = $this->vbox->openMedium($args['src'], 'HardDisk', 'ReadWrite', false);
  
  		$type = array(($args['type'] == 'fixed' ? 'Fixed' : 'Standard'));
  		if($args['split']) $type[] = 'VmdkSplit2G';
@@ -158,7 +167,7 @@
  
  		/* @var $m IMedium */
 -		$m = $this->vbox->openMedium($args['medium'], 'HardDisk');
-+		$m = $this->vbox->openMedium($args['medium'], 'HardDisk',null,null);
++		$m = $this->vbox->openMedium($args['medium'], 'HardDisk', 'ReadWrite', false);
  		$m->type = $args['type'];
  		$m->releaseRemote();
  
@@ -176,7 +185,7 @@
  
  		/* @var $m IMedium */
 -		$m = $this->vbox->openMedium($args['medium'],$args['type']);
-+		$m = $this->vbox->openMedium($args['medium'],$args['type'],null,null);
++		$m = $this->vbox->openMedium($args['medium'],$args['type'],'ReadWrite',false);
  		$mediumid = $m->id;
  
  		// connected to...
@@ -185,7 +194,7 @@
  
  		/* @var $m IMedium */
 -		$m = $this->vbox->openMedium($args['medium'],$args['type']);
-+		$m = $this->vbox->openMedium($args['medium'],$args['type'],null,null);
++		$m = $this->vbox->openMedium($args['medium'],$args['type'],'ReadWrite',false);
  
  		if($args['delete'] && @$this->settings->deleteOnRemove && (string)$m->deviceType == 'HardDisk') {
  
@@ -194,7 +203,7 @@
  			} else {
  				/* @var $med IMedium */
 -				$med = $this->vbox->openMedium($args['medium']['location'],$args['medium']['deviceType']);
-+				$med = $this->vbox->openMedium($args['medium']['location'],$args['medium']['deviceType'],null,null);
++				$med = $this->vbox->openMedium($args['medium']['location'],$args['medium']['deviceType'],'ReadWrite',false);
  			}
  		}
  
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index e84967ed1a38..2affa9c95243 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django
 CATEGORIES=	www python
-PORTVERSION=	1.11.4
+PORTVERSION=	1.11.5
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/www/py-django110/Makefile b/www/py-django110/Makefile
index 7c38ce49d41d..6a5e59cb81f5 100644
--- a/www/py-django110/Makefile
+++ b/www/py-django110/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	django
-PORTVERSION=	1.10.7
-PORTREVISION=	2
+PORTVERSION=	1.10.8
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		https://www.djangoproject.com/m/releases/${PORTVERSION}/
diff --git a/www/py-django110/distinfo b/www/py-django110/distinfo
index a15be3ce2fb0..92d1019fd68f 100644
--- a/www/py-django110/distinfo
+++ b/www/py-django110/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491326536
-SHA256 (python/Django-1.10.7.tar.gz) = 593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8
-SIZE (python/Django-1.10.7.tar.gz) = 7737654
+TIMESTAMP = 1504718727
+SHA256 (python/Django-1.10.8.tar.gz) = d4ef83bd326573c00972cb9429beb396d210341a636e4b816fc9b3f505c498bb
+SIZE (python/Django-1.10.8.tar.gz) = 7739226
diff --git a/www/py-django111/Makefile b/www/py-django111/Makefile
index 300c7f6c6ec3..f2f3268013d1 100644
--- a/www/py-django111/Makefile
+++ b/www/py-django111/Makefile
@@ -4,8 +4,7 @@
 # Remember to update www/py-django along with this port.
 
 PORTNAME=	django
-PORTVERSION=	1.11.4
-PORTREVISION=	1
+PORTVERSION=	1.11.5
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		https://www.djangoproject.com/m/releases/${PORTVERSION}/
diff --git a/www/py-django111/distinfo b/www/py-django111/distinfo
index e2abf21d6feb..1dfd651204a0 100644
--- a/www/py-django111/distinfo
+++ b/www/py-django111/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501694429
-SHA256 (python/Django-1.11.4.tar.gz) = abe86e67dda9897a1536a727ed57dbefb5a42b41943be3b116fe3edab4c07bb2
-SIZE (python/Django-1.11.4.tar.gz) = 7870752
+TIMESTAMP = 1504718744
+SHA256 (python/Django-1.11.5.tar.gz) = 1836878162dfdf865492bacfdff0321e4ee8f1e7d51d93192546000b54982b29
+SIZE (python/Django-1.11.5.tar.gz) = 7875054
diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index e9854edd4c26..a111744a8fea 100644
--- a/www/py-flexget/Makefile
+++ b/www/py-flexget/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flexget
-PORTVERSION=	2.10.83
+PORTVERSION=	2.10.88
 PORTEPOCH=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo
index 1b6d40040694..a9fd6df1c7d6 100644
--- a/www/py-flexget/distinfo
+++ b/www/py-flexget/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503886435
-SHA256 (flexget-Flexget-2.10.83_GH0.tar.gz) = b422f9b5522eb28d61591e6d71a24afc226266c9672d5387b37485df6ec00cc6
-SIZE (flexget-Flexget-2.10.83_GH0.tar.gz) = 6581802
+TIMESTAMP = 1505096029
+SHA256 (flexget-Flexget-2.10.88_GH0.tar.gz) = 2fc29efd04a42c4a317827ae569ecb150e036ee684aee64a297dcca36656d4e4
+SIZE (flexget-Flexget-2.10.88_GH0.tar.gz) = 6584182
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index 3ca7da0b0020..b033d61d594a 100644
--- a/www/py-gandi.cli/Makefile
+++ b/www/py-gandi.cli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gandi.cli
-PORTVERSION=	0.19
+PORTVERSION=	0.21
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy
 
+# Actually 2.6-3.6(+)
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
@@ -29,10 +30,6 @@ NO_ARCH=	yes
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
-post-extract:
-	${FIND} ${WRKSRC} -type d -name __pycache__ -exec ${RM} -r {} + && \
-	${FIND} ${WRKSRC} -type f -name '*.py[co]' -exec ${RM} {} +
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
diff --git a/www/py-gandi.cli/distinfo b/www/py-gandi.cli/distinfo
index cef092ce5a91..8544aa80967d 100644
--- a/www/py-gandi.cli/distinfo
+++ b/www/py-gandi.cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469713650
-SHA256 (gandi.cli-0.19.tar.gz) = 0e8e1150f68c8921f279c629e6e7beaa4125d10c0d1990ede991fb0ceec928f3
-SIZE (gandi.cli-0.19.tar.gz) = 143863
+TIMESTAMP = 1505202146
+SHA256 (gandi.cli-0.21.tar.gz) = 931da484b50a3cb99f58013588b749be01663488689c5057035434a37befd8c5
+SIZE (gandi.cli-0.21.tar.gz) = 149213
diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile
new file mode 100644
index 000000000000..d90c5bef226d
--- /dev/null
+++ b/www/py-planet/Makefile
@@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	planet
+PORTVERSION=	1.0.1
+CATEGORIES=	www python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python client library and CLI for Planet's public API #'
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures
+
+USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+
+.include <bsd.port.mk>
diff --git a/www/py-planet/distinfo b/www/py-planet/distinfo
new file mode 100644
index 000000000000..657ab9bee031
--- /dev/null
+++ b/www/py-planet/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505229319
+SHA256 (planet-1.0.1.tar.gz) = a6a10b1b8de1493d82a27d8fe27a8611fffce193bce57ff7ec59941a925be534
+SIZE (planet-1.0.1.tar.gz) = 27185
diff --git a/www/py-planet/pkg-descr b/www/py-planet/pkg-descr
new file mode 100644
index 000000000000..d8f9e0b646b7
--- /dev/null
+++ b/www/py-planet/pkg-descr
@@ -0,0 +1,7 @@
+This library provides a command-line-interface (CLI) and Python library to make
+access to Planet's public API easy to use.
+
+The command line interface is intended to be functional for many tasks but is
+just a thin layer on the lower level Python API.
+
+WWW: https://pypi.python.org/pypi/planet
diff --git a/www/rejik/Makefile b/www/rejik/Makefile
index e32177d29c87..818cc4f666ac 100644
--- a/www/rejik/Makefile
+++ b/www/rejik/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rejik
 PORTVERSION=	3.2.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.rejik.ru/download/
 DISTNAME=	redirector-${PORTVERSION}_squid_3.4
diff --git a/www/rtv/Makefile b/www/rtv/Makefile
index 5d4d7857f5c4..9bd80c26d5da 100644
--- a/www/rtv/Makefile
+++ b/www/rtv/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rtv
-PORTVERSION=	1.17.1
+PORTVERSION=	1.18.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/rtv/distinfo b/www/rtv/distinfo
index 5b25c23de040..430378062aac 100644
--- a/www/rtv/distinfo
+++ b/www/rtv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502235568
-SHA256 (michael-lazar-rtv-v1.17.1_GH0.tar.gz) = 719c36da951e0bb7e77ed3e3efbb8b32d9045918c4af17fa7af4e334b9ebbfd9
-SIZE (michael-lazar-rtv-v1.17.1_GH0.tar.gz) = 8357185
+TIMESTAMP = 1504959559
+SHA256 (michael-lazar-rtv-v1.18.0_GH0.tar.gz) = 44e49253db01bcda5992b80804444c6e996092146c5176a7f44ca1a1f1abe815
+SIZE (michael-lazar-rtv-v1.18.0_GH0.tar.gz) = 9095873
diff --git a/www/rubygem-actioncable5/Makefile b/www/rubygem-actioncable5/Makefile
index 9865f643b3ec..bf2701ef6b8d 100644
--- a/www/rubygem-actioncable5/Makefile
+++ b/www/rubygem-actioncable5/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	actioncable
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/www/rubygem-actioncable5/distinfo b/www/rubygem-actioncable5/distinfo
index ffc3c84a60ef..ab4792522e89 100644
--- a/www/rubygem-actioncable5/distinfo
+++ b/www/rubygem-actioncable5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862702
-SHA256 (rubygem/actioncable-5.1.3.gem) = 4cfe1343217caa199ce2a2de485a62271b0c81e8c3cf72f7c039c5eddf3c7bd0
-SIZE (rubygem/actioncable-5.1.3.gem) = 41472
+TIMESTAMP = 1504891674
+SHA256 (rubygem/actioncable-5.1.4.gem) = 47d968f5636aa2ee88cb6306a7cb8b426b2156c93851628a354cae9139d56916
+SIZE (rubygem/actioncable-5.1.4.gem) = 41472
diff --git a/www/rubygem-actioncable5/files/patch-gemspec b/www/rubygem-actioncable5/files/patch-gemspec
new file mode 100644
index 000000000000..49390c4ec012
--- /dev/null
+++ b/www/rubygem-actioncable5/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- actioncable.gemspec.orig	2017-09-12 19:41:46 UTC
++++ actioncable.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<actionpack>.freeze, ["= 5.1.4"])
+       s.add_runtime_dependency(%q<nio4r>.freeze, ["~> 2.0"])
+-      s.add_runtime_dependency(%q<websocket-driver>.freeze, ["~> 0.6.1"])
++      s.add_runtime_dependency(%q<websocket-driver>.freeze, ["~> 0.6", ">= 0.6.1"])
+     else
+       s.add_dependency(%q<actionpack>.freeze, ["= 5.1.4"])
+       s.add_dependency(%q<nio4r>.freeze, ["~> 2.0"])
diff --git a/www/rubygem-actioncable50/Makefile b/www/rubygem-actioncable50/Makefile
index 4bf3c7e05683..1baa5a9dcf9a 100644
--- a/www/rubygem-actioncable50/Makefile
+++ b/www/rubygem-actioncable50/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	actioncable
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/www/rubygem-actioncable50/distinfo b/www/rubygem-actioncable50/distinfo
index e50b9d5d103e..9fc54c5739d4 100644
--- a/www/rubygem-actioncable50/distinfo
+++ b/www/rubygem-actioncable50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604045
-SHA256 (rubygem/actioncable-5.0.5.gem) = 479efb52e6b6fedfcafcd3530be24dc7b9829dd41e0f5a37212ed4d67146f51b
-SIZE (rubygem/actioncable-5.0.5.gem) = 42496
+TIMESTAMP = 1504891763
+SHA256 (rubygem/actioncable-5.0.6.gem) = 8321d86a6bb9ec85b5189093139bbdfb87ad1935166e5c0eac422068a2a6e515
+SIZE (rubygem/actioncable-5.0.6.gem) = 42496
diff --git a/www/rubygem-actioncable50/files/patch-gemspec b/www/rubygem-actioncable50/files/patch-gemspec
new file mode 100644
index 000000000000..fea9bab5bdf5
--- /dev/null
+++ b/www/rubygem-actioncable50/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- actioncable.gemspec.orig	2017-09-12 19:42:51 UTC
++++ actioncable.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<actionpack>.freeze, ["= 5.0.6"])
+       s.add_runtime_dependency(%q<nio4r>.freeze, ["< 3.0", ">= 1.2"])
+-      s.add_runtime_dependency(%q<websocket-driver>.freeze, ["~> 0.6.1"])
++      s.add_runtime_dependency(%q<websocket-driver>.freeze, ["~> 0.6", ">= 0.6.1"])
+       s.add_development_dependency(%q<blade>.freeze, ["~> 0.5.1"])
+     else
+       s.add_dependency(%q<actionpack>.freeze, ["= 5.0.6"])
diff --git a/www/rubygem-actionpack5/Makefile b/www/rubygem-actionpack5/Makefile
index 640c260e3fb9..5725f5f78c9b 100644
--- a/www/rubygem-actionpack5/Makefile
+++ b/www/rubygem-actionpack5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionpack
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/www/rubygem-actionpack5/distinfo b/www/rubygem-actionpack5/distinfo
index 525822c1cc95..954056d09b6a 100644
--- a/www/rubygem-actionpack5/distinfo
+++ b/www/rubygem-actionpack5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862696
-SHA256 (rubygem/actionpack-5.1.3.gem) = 55488d20cac3668040f0d2d5531e81318a0fa206ac8f687565c6ec49345c9f45
-SIZE (rubygem/actionpack-5.1.3.gem) = 206848
+TIMESTAMP = 1504891667
+SHA256 (rubygem/actionpack-5.1.4.gem) = f5d0e747051923f19d932bbc5c274353d026d3b4aaf9504f240161330555e4c6
+SIZE (rubygem/actionpack-5.1.4.gem) = 206848
diff --git a/www/rubygem-actionpack5/files/patch-gemspec b/www/rubygem-actionpack5/files/patch-gemspec
deleted file mode 100644
index e25926451448..000000000000
--- a/www/rubygem-actionpack5/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- actionpack.gemspec.orig	2017-07-14 15:28:47 UTC
-+++ actionpack.gemspec
-@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-       s.add_runtime_dependency(%q<activesupport>.freeze, ["= 5.1.2"])
-       s.add_runtime_dependency(%q<rack>.freeze, ["~> 2.0"])
--      s.add_runtime_dependency(%q<rack-test>.freeze, ["~> 0.6.3"])
-+      s.add_runtime_dependency(%q<rack-test>.freeze, ["~> 0.6", ">= 0.6.3"])
-       s.add_runtime_dependency(%q<rails-html-sanitizer>.freeze, [">= 1.0.2", "~> 1.0"])
-       s.add_runtime_dependency(%q<rails-dom-testing>.freeze, ["~> 2.0"])
-       s.add_runtime_dependency(%q<actionview>.freeze, ["= 5.1.2"])
diff --git a/www/rubygem-actionpack50/Makefile b/www/rubygem-actionpack50/Makefile
index 500e37494085..a2fe341f5cf7 100644
--- a/www/rubygem-actionpack50/Makefile
+++ b/www/rubygem-actionpack50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionpack
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/www/rubygem-actionpack50/distinfo b/www/rubygem-actionpack50/distinfo
index 8deaec570547..66b9d2cec285 100644
--- a/www/rubygem-actionpack50/distinfo
+++ b/www/rubygem-actionpack50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604038
-SHA256 (rubygem/actionpack-5.0.5.gem) = 2202866aded8d787efb4c3a7e6d4f55262ac4f2acfe92c097855a9afc8229f37
-SIZE (rubygem/actionpack-5.0.5.gem) = 212480
+TIMESTAMP = 1504891756
+SHA256 (rubygem/actionpack-5.0.6.gem) = 1866fbaafcba1a6f23ea075f0c7add8980f99d2f2ddc37032d4b62033b39bf8d
+SIZE (rubygem/actionpack-5.0.6.gem) = 212480
diff --git a/www/rubygem-deckar01-task_list1/Makefile b/www/rubygem-deckar01-task_list1/Makefile
index 1bb4c7ff4c4b..ca51e81aa1ad 100644
--- a/www/rubygem-deckar01-task_list1/Makefile
+++ b/www/rubygem-deckar01-task_list1/Makefile
@@ -12,6 +12,9 @@ COMMENT=	Markdown TaskList components
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Use www/rubygem-deckar01-task_list instead
+EXPIRATION_DATE=2017-09-30
+
 RUN_DEPENDS=	rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
 		rubygem-html-pipeline1>=0:textproc/rubygem-html-pipeline1 \
 		rubygem-rack16>=1.0:www/rubygem-rack16
diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile
index fd0a3b9c81fd..88b5e850faed 100644
--- a/www/rubygem-haml/Makefile
+++ b/www/rubygem-haml/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haml
-PORTVERSION=	5.0.2
+PORTVERSION=	5.0.3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-haml/distinfo b/www/rubygem-haml/distinfo
index 531fca9311f2..740d6bf1bc22 100644
--- a/www/rubygem-haml/distinfo
+++ b/www/rubygem-haml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501766614
-SHA256 (rubygem/haml-5.0.2.gem) = a82ad5831cd0aa30de558618768237ed773a1263607aab58c764192e68a08cdc
-SIZE (rubygem/haml-5.0.2.gem) = 89088
+TIMESTAMP = 1504948375
+SHA256 (rubygem/haml-5.0.3.gem) = f9a5b38a1298170df4b1293d29b0d8d12d2afd1f495bf7df2e0eb07afa95b4fc
+SIZE (rubygem/haml-5.0.3.gem) = 89600
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 217da7ba781f..21665618d967 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	5.1.5
+PORTVERSION=	5.1.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 36c388874aa6..eecdfedd7dfe 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498919476
-SHA256 (rubygem/passenger-5.1.5.gem) = 2245ddd0dc5288c677d3e9a2cef628d124fda1d4fed1c5a202db9e6f7a9840ed
-SIZE (rubygem/passenger-5.1.5.gem) = 5132800
+TIMESTAMP = 1504728501
+SHA256 (rubygem/passenger-5.1.8.gem) = 983671eae7f6eb36e0bfeea9a1f1aac5d6a3ea27e0420652c264c7ad33301e13
+SIZE (rubygem/passenger-5.1.8.gem) = 5150208
diff --git a/www/rubygem-rack-cache/Makefile b/www/rubygem-rack-cache/Makefile
index e0eb2fd3b474..fb165f11a1da 100644
--- a/www/rubygem-rack-cache/Makefile
+++ b/www/rubygem-rack-cache/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rack-cache
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-rack-cache/distinfo b/www/rubygem-rack-cache/distinfo
index 67ecf857dbf8..7e8592331ba4 100644
--- a/www/rubygem-rack-cache/distinfo
+++ b/www/rubygem-rack-cache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485269819
-SHA256 (rubygem/rack-cache-1.7.0.gem) = 12e21f063e49792ee59ac4b437c52ae1a1ceb991242ef11edbc2dc5aa14eb592
-SIZE (rubygem/rack-cache-1.7.0.gem) = 28160
+TIMESTAMP = 1504799743
+SHA256 (rubygem/rack-cache-1.7.1.gem) = 43cb11d625771bd331558b19aabafacb313b4fdcb58d3f99f98a2aac0f55c945
+SIZE (rubygem/rack-cache-1.7.1.gem) = 28160
diff --git a/www/rubygem-rails5/Makefile b/www/rubygem-rails5/Makefile
index 8eeeaf7eb974..0b4f0a5de9a0 100644
--- a/www/rubygem-rails5/Makefile
+++ b/www/rubygem-rails5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/www/rubygem-rails5/distinfo b/www/rubygem-rails5/distinfo
index c5c30b600968..2c4f1bdf299c 100644
--- a/www/rubygem-rails5/distinfo
+++ b/www/rubygem-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501797501
-SHA256 (rubygem/rails-5.1.3.gem) = 28c73c5aba5ce71d4bcd6af273be3e565ab7a49abd22fd511dc79fcb36329d19
-SIZE (rubygem/rails-5.1.3.gem) = 6656
+TIMESTAMP = 1504891712
+SHA256 (rubygem/rails-5.1.4.gem) = 5cc2192045678789e5e7b289476af8bc0a79210ee6713886200cb303ed6f98b8
+SIZE (rubygem/rails-5.1.4.gem) = 6656
diff --git a/www/rubygem-rails50/Makefile b/www/rubygem-rails50/Makefile
index 9074f2849ce5..63000cd04a14 100644
--- a/www/rubygem-rails50/Makefile
+++ b/www/rubygem-rails50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/www/rubygem-rails50/distinfo b/www/rubygem-rails50/distinfo
index c33928370e7d..e091146e69b4 100644
--- a/www/rubygem-rails50/distinfo
+++ b/www/rubygem-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501607829
-SHA256 (rubygem/rails-5.0.5.gem) = 15e2c25872e5dc2069b0d7bf4535eb4887e77d49166ccfba5871a904c18957b1
-SIZE (rubygem/rails-5.0.5.gem) = 6144
+TIMESTAMP = 1504891801
+SHA256 (rubygem/rails-5.0.6.gem) = a86663f8d0d4dd0cb07272394a6d0c7d250be617c6efe77edd2ebc9c9d139746
+SIZE (rubygem/rails-5.0.6.gem) = 6144
diff --git a/www/rubygem-railties5/Makefile b/www/rubygem-railties5/Makefile
index 6f453c9e30f5..ab3f17ab6282 100644
--- a/www/rubygem-railties5/Makefile
+++ b/www/rubygem-railties5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	railties
-PORTVERSION=	5.1.3
+PORTVERSION=	5.1.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
diff --git a/www/rubygem-railties5/distinfo b/www/rubygem-railties5/distinfo
index fa9dd537449d..a65905811a46 100644
--- a/www/rubygem-railties5/distinfo
+++ b/www/rubygem-railties5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862718
-SHA256 (rubygem/railties-5.1.3.gem) = 9aa1b3abd29a7d71b3f9d04dfce2858a2e86841dd7f3dc696344000c745b1651
-SIZE (rubygem/railties-5.1.3.gem) = 229888
+TIMESTAMP = 1504891690
+SHA256 (rubygem/railties-5.1.4.gem) = e477f332b4810f634b58a33c3accdebcfb9d3ab1f4b7b3ed204269d6b1a28001
+SIZE (rubygem/railties-5.1.4.gem) = 228352
diff --git a/www/rubygem-railties50/Makefile b/www/rubygem-railties50/Makefile
index 0a5d9c3d5475..e000cf6091bb 100644
--- a/www/rubygem-railties50/Makefile
+++ b/www/rubygem-railties50/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	railties
-PORTVERSION=	5.0.5
+PORTVERSION=	5.0.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	50
diff --git a/www/rubygem-railties50/distinfo b/www/rubygem-railties50/distinfo
index 6b0ab929ac78..986744541b0e 100644
--- a/www/rubygem-railties50/distinfo
+++ b/www/rubygem-railties50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501604063
-SHA256 (rubygem/railties-5.0.5.gem) = 5b1cb323c3fa70ff5801f58fbb9688a8231a4cc0414d3c97d0ad0a5bc94fbefb
-SIZE (rubygem/railties-5.0.5.gem) = 225792
+TIMESTAMP = 1504891779
+SHA256 (rubygem/railties-5.0.6.gem) = b05fbd99673637408badc3da8988aa76c9f245d9f0202dc65389e6b619e97772
+SIZE (rubygem/railties-5.0.6.gem) = 223744
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index 4efe15d03c39..d3744dfa3975 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	selenium-webdriver
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-selenium-webdriver/distinfo b/www/rubygem-selenium-webdriver/distinfo
index d91789ce85c0..da829d725bf1 100644
--- a/www/rubygem-selenium-webdriver/distinfo
+++ b/www/rubygem-selenium-webdriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502888782
-SHA256 (rubygem/selenium-webdriver-3.5.1.gem) = 7fb36c73618ddcd1553313de9e2e3100d4e767ec752f2e2cdb17b553e6d9ee28
-SIZE (rubygem/selenium-webdriver-3.5.1.gem) = 830464
+TIMESTAMP = 1504799750
+SHA256 (rubygem/selenium-webdriver-3.5.2.gem) = fe42fdc7dfb654488715b79b970f59937a19acbbd1ad52e30206bfb3a8815d82
+SIZE (rubygem/selenium-webdriver-3.5.2.gem) = 830976
diff --git a/www/rubygem-websocket-driver/Makefile b/www/rubygem-websocket-driver/Makefile
index a7c92a63a43c..654890796532 100644
--- a/www/rubygem-websocket-driver/Makefile
+++ b/www/rubygem-websocket-driver/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	websocket-driver
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-websocket-driver/distinfo b/www/rubygem-websocket-driver/distinfo
index de9064b22dbd..e91be623f2f5 100644
--- a/www/rubygem-websocket-driver/distinfo
+++ b/www/rubygem-websocket-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485189751
-SHA256 (rubygem/websocket-driver-0.6.5.gem) = b4a4e0c75eae9e85ceb248d4dc13519da581452767dcd5126c1452ea052183a4
-SIZE (rubygem/websocket-driver-0.6.5.gem) = 22016
+TIMESTAMP = 1505229728
+SHA256 (rubygem/websocket-driver-0.7.0.gem) = b685472c3905f9dedcdbf5db96fd4d6b46a02f2d764887e11b6bcea1dd98a194
+SIZE (rubygem/websocket-driver-0.7.0.gem) = 22016
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile
index eefec1691c17..2c032030847f 100644
--- a/www/spdylay/Makefile
+++ b/www/spdylay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spdylay
 PORTVERSION=	1.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www net
 MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
index 31f1498e4ef6..04c4b0f5fffe 100644
--- a/www/squid-devel/Makefile
+++ b/www/squid-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	4.0.21
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
 		http://www2.us.squid-cache.org/Versions/v4/ \
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 593ab49565c0..090b24c57d1d 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tdiary
 PORTVERSION=	5.0.5
+PORTREVISION=	1
 CATEGORIES?=	www ruby
 MASTER_SITES=	https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
@@ -10,7 +11,7 @@ DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Web-based diary system (like weblog) written in Ruby
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-bundler>=1.14.6:sysutils/rubygem-bundler \
diff --git a/www/tdiary/files/tdiaryinst.rb.in b/www/tdiary/files/tdiaryinst.rb.in
index e2b38be89095..b24b7b2b8ed7 100644
--- a/www/tdiary/files/tdiaryinst.rb.in
+++ b/www/tdiary/files/tdiaryinst.rb.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!%%LOCALBASE%%/bin/ruby
 #
 # tdiaryinstall.rb - tDiary user directory copy script
 # Date created:                        13 July 2003
@@ -141,39 +141,47 @@ class TdiaryInstall
     if ! FileTest.exist?("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/images")
       FileUtils.mkdir_p("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/images", @fileutilOptions)
     end
+    if ! FileTest.exist?("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tmp")
+      FileUtils.mkdir_p("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tmp", @fileutilOptions)
+    end
   end
 
   def linkBaseFile
+    FileUtils.ln_s("#{@tdiarydocdir}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/doc", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/Gemfile", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/app.json", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/benchmark", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/bin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/index.fcgi", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/index.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
     FileUtils.ln_s("#{@tdiarymaster}/js", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/lib", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/package.json", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
     FileUtils.ln_s("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
-    FileUtils.ln_s("#{@tdiarydocdir}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/doc", @fileutilOptions)
-    tempfile = Tempfile.new("index.rb")
-    tempfile.write "#!/usr/local/bin/ruby\nrequire '#{@tdiarymaster}/index'\n"
-    tempfile.close
-    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
-    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
-    tempfile = Tempfile.new("update.rb")
-    tempfile.write "#!/usr/local/bin/ruby\nrequire '#{@tdiarymaster}/update'\n"
-    tempfile.close
-    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
-    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/update.fcgi", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/update.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.ln_s("#{@tdiarymaster}/views", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
   end
 
   def copyBaseFile
     opts = @fileutilOptions.dup
     opts.store(:preserve, true)
     FileUtils.cp_r("#{@tdiarydocdir}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/doc", opts)
+    FileUtils.cp("#{@tdiarymaster}/Gemfile", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.cp("#{@tdiarymaster}/app.json", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.cp_r("#{@tdiarymaster}/benchmark", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
+    FileUtils.cp_r("#{@tdiarymaster}/bin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
+    FileUtils.cp("#{@tdiarymaster}/index.fcgi", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.cp("#{@tdiarymaster}/index.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
     FileUtils.cp_r("#{@tdiarymaster}/js", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
+    FileUtils.cp_r("#{@tdiarymaster}/lib", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
     FileUtils.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
-    FileUtils.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
-    FileUtils.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
-    FileUtils.cp_r("#{@tdiarymaster}/tdiary", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
+    FileUtils.cp("#{@tdiarymaster}/package.json", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
     FileUtils.cp_r("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
-    FileUtils.cp("#{@tdiarymaster}/index.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
-    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
-    FileUtils.cp("#{@tdiarymaster}/update.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
-    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
-    FileUtils.cp("#{@tdiarymaster}/tdiary.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.rb", @fileutilOptions)
+    FileUtils.cp("#{@tdiarymaster}/update.fcgi", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.cp("#{@tdiarymaster}/update.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+    FileUtils.cp_r("#{@tdiarymaster}/views", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
   end
 
   def installConfig
@@ -206,14 +214,24 @@ class TdiaryInstall
   end
 
   def setPermissions
-    FileUtils.chmod(0777, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions) if ! defined?($OPT_SUEXEC)
-    FileUtils.chmod(0777, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions) if ! defined?($OPT_SUEXEC)
-
-    FileUtils.chmod(0701, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions) if defined?($OPT_SUEXEC)
-    FileUtils.chmod(0701, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions) if defined?($OPT_SUEXEC)
-    FileUtils.chmod(0604, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", @fileutilOptions) if defined?($OPT_SUEXEC)
-    FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions) if defined?($OPT_SUEXEC)
-    FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions) if defined?($OPT_SUEXEC)
+    if (defined?($OPT_SUEXEC))
+      FileUtils.chmod(0701, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions)
+      FileUtils.chmod(0701, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+      FileUtils.chmod(0604, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", @fileutilOptions)
+      FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.fcgi", @fileutilOptions)
+      FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
+      FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.fcgi", @fileutilOptions)
+      FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
+    else
+      FileUtils.chmod(0777, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions)
+      FileUtils.chmod(0777, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
+      FileUtils.chmod(0644, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", @fileutilOptions)
+      FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.fcgi", @fileutilOptions)
+      FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
+      FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.fcgi", @fileutilOptions)
+      FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
+    end
+    FileUtils.chmod(0644, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/dot.htaccess", @fileutilOptions)
 
     if @euid == 0 then
       Find.find("#{@passwd.dir}/#{@diarydir}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}") do |f|
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index dddeb8ac8092..f6646f7a917a 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	thundercache
 PORTVERSION=	6.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	www
 MASTER_SITES=	http://www.thundercache.com.br/dist/ \
 		http://www.bmsoftware.org/packs/ \
diff --git a/www/typo3-8/Makefile b/www/typo3-8/Makefile
index f462b3210a1a..d7281a0aa2a9 100644
--- a/www/typo3-8/Makefile
+++ b/www/typo3-8/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${TYPO3SRC}
 
 PORT_V_MAJOR=	8
 PORT_V_MINOR=	7
-PORT_V_PATCH=	5
+PORT_V_PATCH=	6
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
@@ -81,6 +81,5 @@ post-install:
 	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/Symfony/Component/Console" >> ${TMPPLIST}
 	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-build-common" >> ${TMPPLIST}
 	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-common" >> ${TMPPLIST}
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/guzzlehttp/guzzle/build" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/typo3-8/distinfo b/www/typo3-8/distinfo
index 13440b727781..36b684bd6f4d 100644
--- a/www/typo3-8/distinfo
+++ b/www/typo3-8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504626311
-SHA256 (typo3_src-8.7.5.tar.gz) = c4d1dea5ab6cff3780a3337dc31903696478695559dc9d186f532e8b080a176b
-SIZE (typo3_src-8.7.5.tar.gz) = 18443995
+TIMESTAMP = 1505310566
+SHA256 (typo3_src-8.7.6.tar.gz) = fd6aa98c5e35a38174f7bb9f3e09c6212c393ede7cab72344e682ba1fea5a545
+SIZE (typo3_src-8.7.6.tar.gz) = 18453545
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 84a390254c2d..f50eb1040d24 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	web2ldap
-PORTVERSION=	1.2.93
+PORTVERSION=	1.2.94
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.sfr-fresh.com/unix/www/
diff --git a/www/web2ldap/distinfo b/www/web2ldap/distinfo
index 2d00689e51f3..95bb1efd3f83 100644
--- a/www/web2ldap/distinfo
+++ b/www/web2ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503684247
-SHA256 (web2ldap-1.2.93.tar.gz) = db37cc7924fb7e10ac9cff845bcdb223c9bdfd4a545e217b7c4682d369fbca9b
-SIZE (web2ldap-1.2.93.tar.gz) = 619550
+TIMESTAMP = 1505137106
+SHA256 (web2ldap-1.2.94.tar.gz) = 1a8ed7b6449c8a4ee370b118082142bf419dd0e0db86e588eaf648cf2ec9898e
+SIZE (web2ldap-1.2.94.tar.gz) = 619633
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 35dabd2074d2..cc7b96768951 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.11
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2
diff --git a/www/webkit-gtk2/files/patch-icu59 b/www/webkit-gtk2/files/patch-icu59
new file mode 100644
index 000000000000..c9a3a7eebbd9
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-icu59
@@ -0,0 +1,64 @@
+------------------------------------------------------------------------
+r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines
+
+Fix compilation with ICU 59.1
+https://bugs.webkit.org/show_bug.cgi?id=171612
+
+Reviewed by Mark Lam.
+
+ICU 59.1 has broken source compatibility. Now it defines UChar as
+char16_t, which does not allow automatic type conversion from unsigned
+short in C++ code.
+
+--- Source/JavaScriptCore/API/JSStringRef.cpp.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(chars, numChars).leakRef();
++    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* 
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
++    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
+ }
+ 
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
+ 
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+-    return string->characters();
++    return reinterpret_cast<const JSChar*>(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- Source/JavaScriptCore/runtime/DateConversion.cpp.orig	2013-08-03 16:10:38 UTC
++++ Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date
+ #if OS(WINDOWS)
+             TIME_ZONE_INFORMATION timeZoneInformation;
+             GetTimeZoneInformation(&timeZoneInformation);
+-            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+ #else
+             struct tm gtm = t;
+             char timeZoneName[70];
+--- Source/WebKit2/Shared/API/c/WKString.cpp.orig	2016-04-10 06:48:37 UTC
++++ Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+-    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+ 
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 05337c3f422a..5b96fb69cbc2 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.11
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
diff --git a/www/webkit-gtk3/files/patch-icu59 b/www/webkit-gtk3/files/patch-icu59
new file mode 100644
index 000000000000..c9a3a7eebbd9
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-icu59
@@ -0,0 +1,64 @@
+------------------------------------------------------------------------
+r216187 | annulen@yandex.ru | 2017-05-05 00:33:41 +0900 (Fri, 05 May 2017) | 28 lines
+
+Fix compilation with ICU 59.1
+https://bugs.webkit.org/show_bug.cgi?id=171612
+
+Reviewed by Mark Lam.
+
+ICU 59.1 has broken source compatibility. Now it defines UChar as
+char16_t, which does not allow automatic type conversion from unsigned
+short in C++ code.
+
+--- Source/JavaScriptCore/API/JSStringRef.cpp.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(chars, numChars).leakRef();
++    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* 
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
++    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
+ }
+ 
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
+ 
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+-    return string->characters();
++    return reinterpret_cast<const JSChar*>(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- Source/JavaScriptCore/runtime/DateConversion.cpp.orig	2013-08-03 16:10:38 UTC
++++ Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, Date
+ #if OS(WINDOWS)
+             TIME_ZONE_INFORMATION timeZoneInformation;
+             GetTimeZoneInformation(&timeZoneInformation);
+-            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+ #else
+             struct tm gtm = t;
+             char timeZoneName[70];
+--- Source/WebKit2/Shared/API/c/WKString.cpp.orig	2016-04-10 06:48:37 UTC
++++ Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+-    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+ 
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 80583ebd1599..f3801e1e7b03 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.16.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
diff --git a/www/wt/Makefile b/www/wt/Makefile
index 1a3e3c8a902d..4f3a9a43d0d7 100644
--- a/www/wt/Makefile
+++ b/www/wt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wt
 PORTVERSION=	3.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	info@babaei.net
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index 7caaaf1afcc5..513833ef93f0 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	yarn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.27.5
+DISTVERSION=	1.0.1
 CATEGORIES=	www
 MASTER_SITES=	https://yarnpkg.com/downloads/${PORTVERSION}/
 
@@ -12,33 +12,44 @@ COMMENT=	Package manager for node, alternative to npm
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-WRKSRC=		${WRKDIR}/dist
-
+OPTIONS_DEFINE=	HADOOPCOMPAT
 OPTIONS_SINGLE=	BACKEND
 OPTIONS_SINGLE_BACKEND=	NODE4 NODE6 NODE
 OPTIONS_DEFAULT=	NODE
+HADOOPCOMPAT_DESC=	hadoop2 compatibility, the yarn script is excluded
 NODE_DESC=	Use www/node as backend
 NODE6_DESC=	Use www/node6 as backend
 NODE4_DESC=	Use www/node4 as backend
 
+OPTIONS_SUB=	yes
+
 NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 NODE6_RUN_DEPENDS=	node6>=0.8.0:www/node6
 NODE4_RUN_DEPENDS=	node4>=0.8.0:www/node4
 
-CONFLICTS_INSTALL=	hadoop-2*
+HADOOPCOMPAT_CONFLICTS_OFF=	hadoop2*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/*.cmd
-	@${REINPLACE_CMD} -i '' -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \
+	@${REINPLACE_CMD} -i '' \
+		-e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \
 		${WRKSRC}/package.json
+	@${REINPLACE_CMD} -i '' -e 's%Linux)%Linux|FreeBSD)%g' \
+		${WRKSRC}/bin/yarn
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/node_modules/yarn)
-	${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js ${STAGEDIR}${PREFIX}/bin/yarn
-	${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg ${STAGEDIR}${PREFIX}/bin/yarnpkg
+	${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js \
+		${STAGEDIR}${PREFIX}/bin/yarn.js
+	${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg \
+		${STAGEDIR}${PREFIX}/bin/yarnpkg
+
+do-install-HADOOPCOMPAT-off:
+	${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \
+		${STAGEDIR}${PREFIX}/bin/yarn
 
 .include <bsd.port.mk>
diff --git a/www/yarn/distinfo b/www/yarn/distinfo
index effb98d4d351..6e5a01e1f7d3 100644
--- a/www/yarn/distinfo
+++ b/www/yarn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498864541
-SHA256 (yarn-v0.27.5.tar.gz) = f0f3510246ee74eb660ea06930dcded7b684eac2593aa979a7add84b72517968
-SIZE (yarn-v0.27.5.tar.gz) = 816114
+TIMESTAMP = 1505124517
+SHA256 (yarn-v1.0.1.tar.gz) = 6b00b5e0a7074a512d39d2d91ba6262dde911d452617939ca4be4a700dd77cf1
+SIZE (yarn-v1.0.1.tar.gz) = 843398
diff --git a/www/yarn/pkg-plist b/www/yarn/pkg-plist
index e5e1c38ef136..637018cb1ccd 100644
--- a/www/yarn/pkg-plist
+++ b/www/yarn/pkg-plist
@@ -1,9 +1,11 @@
-bin/yarn
+%%NO_HADOOPCOMPAT%%bin/yarn
+bin/yarn.js
 bin/yarnpkg
+lib/node_modules/yarn/README.md
 lib/node_modules/yarn/LICENSE
 @(,,755) lib/node_modules/yarn/bin/yarn
 @(,,755) lib/node_modules/yarn/bin/yarn.js
 @(,,755) lib/node_modules/yarn/bin/yarnpkg
 lib/node_modules/yarn/lib/v8-compile-cache.js
-@(,,755) lib/node_modules/yarn/lib/yarn-cli.js
+@(,,755) lib/node_modules/yarn/lib/cli.js
 lib/node_modules/yarn/package.json
diff --git a/www/you-get/Makefile b/www/you-get/Makefile
index 55b6ac00d31a..87b0772bae96 100644
--- a/www/you-get/Makefile
+++ b/www/you-get/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	you-get
-PORTVERSION=	0.4.803
+PORTVERSION=	0.4.909
 CATEGORIES=	www
 MASTER_SITES=	CHEESESHOP
 
diff --git a/www/you-get/distinfo b/www/you-get/distinfo
index fcd54a029ce0..5d557cd756be 100644
--- a/www/you-get/distinfo
+++ b/www/you-get/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500909254
-SHA256 (you-get-0.4.803.tar.gz) = c9ae093b08dc9411e9b418f0d3ac75ad3d0776b49df2652b38878b614e62291d
-SIZE (you-get-0.4.803.tar.gz) = 127258
+TIMESTAMP = 1505250363
+SHA256 (you-get-0.4.909.tar.gz) = abdd89afc5d2b3f20c6d7d52b63e840fc3c468f3c0950b480486e9877bdce210
+SIZE (you-get-0.4.909.tar.gz) = 134217
author	Koop Mast <kwm@rainbow-runner.nl>	2017-09-15 15:12:44 +0800
committer	Koop Mast <kwm@rainbow-runner.nl>	2017-09-15 15:12:44 +0800
commit	ab1f40794d9dbcc1388a9257d285362f52f74596 (patch)
tree	2a6a7e2dc039c429914eaca76a443556bf403df2 /www
parent	fd6770ac21bfbaf4055314e3e44262e074d8043b (diff)
parent	26f34f6d62441f81a8d0d43f1908a496c283ee05 (diff)
download	freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.tar.gz freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.tar.zst freebsd-ports-gnome-ab1f40794d9dbcc1388a9257d285362f52f74596.zip