svn commit: r467722 - in branches/2018Q2/www/gitlab: . files

Matthias Fechner mfechner at FreeBSD.org
Wed Apr 18 17:18:44 UTC 2018 

Author: mfechner
Date: Wed Apr 18 17:18:42 2018
New Revision: 467722
URL: https://svnweb.freebsd.org/changeset/ports/467722

Log:
  MFH: r466676 r466677
  
  Update gitlab to version 10.5.6.
  For changelog what changed to 10.5 release see here: https://about.gitlab.com/2018/02/22/gitlab-10-5-released/
  
  Reviewed by:	tz (mentor)
  Approved by:	tz (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14963
  
  The commit r466676 failed to remove an obsolete file, this commit fixes this.
  
  Reviewed by:	tz (mentor)
  Approved by:	tz (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14963
  
  Approved by:	ports-secteam (eadler)

Deleted:
  branches/2018Q2/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
Modified:
  branches/2018Q2/www/gitlab/Makefile
  branches/2018Q2/www/gitlab/distinfo
  branches/2018Q2/www/gitlab/files/patch-Gemfile
  branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example
  branches/2018Q2/www/gitlab/files/patch-config_initializers_1__settings.rb
  branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab
  branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
  branches/2018Q2/www/gitlab/pkg-descr
  branches/2018Q2/www/gitlab/pkg-message
  branches/2018Q2/www/gitlab/pkg-plist
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/www/gitlab/Makefile
==============================================================================
--- branches/2018Q2/www/gitlab/Makefile	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/Makefile	Wed Apr 18 17:18:42 2018	(r467722)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	10.4.6
+PORTVERSION=	10.5.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -25,12 +25,14 @@ BUILD_DEPENDS=	gem:devel/ruby-gems
 # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
 # for the options
 RUN_DEPENDS=	git>=2.14.3:devel/git \
-	gitlab-shell>=5.11.0:devel/gitlab-shell\
-	gitlab-workhorse>=3.3.1:www/gitlab-workhorse \
+	gitlab-shell>=6.0.3:devel/gitlab-shell \
+	gitlab-workhorse>=3.6.0:www/gitlab-workhorse \
+	gitaly>=0.82.0:devel/gitaly \
+	gitlab-pages>=0.6.0:www/gitlab-pages \
 	redis>=2.8.23:databases/redis \
 	npm>=4.3.0:www/npm \
 	yarn>=0.17.0:www/yarn \
-	rubygem-rails4>=4.2.8:www/rubygem-rails4 \
+	rubygem-rails4>=4.2.10:www/rubygem-rails4 \
 	rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
 	rubygem-responders>=2.0:www/rubygem-responders \
 	rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
@@ -89,7 +91,7 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	rubygem-fog-aliyun>=0.2.0:net/rubygem-fog-aliyun \
 	rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \
 	rubygem-unf>=0.1.4:textproc/rubygem-unf \
-	rubygem-seed-fu236>=2.3.6:databases/rubygem-seed-fu236 \
+	rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \
 	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
 	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
@@ -104,7 +106,7 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \
 	rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
 	rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \
-	rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri  \
+	rubygem-nokogiri>=1.8.2:textproc/rubygem-nokogiri \
 	rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \
 	rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \
 	rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \
@@ -141,6 +143,7 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
 	rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \
 	rubygem-oj2>=2.17.4:devel/rubygem-oj2 \
+	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
 	rubygem-chronic>=0.10.2:devel/rubygem-chronic \
 	rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
 	rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \
@@ -173,7 +176,7 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	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.beta44:devel/rubygem-prometheus-client-mmap \
+	rubygem-prometheus-client-mmap>=0.9.1:devel/rubygem-prometheus-client-mmap \
 	rubygem-octokit46>=4.6.2:net/rubygem-octokit46 \
 	rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
 	rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
@@ -187,8 +190,9 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
 	rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
 	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
-	rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \
+	rubygem-gitaly-proto084>=0.84.0:net/rubygem-gitaly-proto084 \
 	rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
+	rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \
 	rubygem-toml-rb03>=0.3.15:www/rubygem-toml-rb03 \
 	rubygem-flipper011>=0.11.0:devel/rubygem-flipper011 \
 	rubygem-flipper-active_record011>=0.11.0:databases/rubygem-flipper-active_record011 \
@@ -198,7 +202,7 @@ RUN_DEPENDS=	git>=2.14.3:devel/git \
 	rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
-PGSQL_RUN_DEPENDS=	rubygem-pg0>=0.18.2:databases/rubygem-pg0 \
+PGSQL_RUN_DEPENDS=	rubygem-pg018>=0.18.2:databases/rubygem-pg018 \
 	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

Modified: branches/2018Q2/www/gitlab/distinfo
==============================================================================
--- branches/2018Q2/www/gitlab/distinfo	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/distinfo	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522311697
-SHA256 (gitlabhq-gitlabhq-v10.4.6_GH0.tar.gz) = db396bcba1b0f50af2b315becd7f9e3795aaa7d4e2e7393a3809c4184cde5130
-SIZE (gitlabhq-gitlabhq-v10.4.6_GH0.tar.gz) = 43412940
+TIMESTAMP = 1522907602
+SHA256 (gitlabhq-gitlabhq-v10.5.7_GH0.tar.gz) = 4b5f172d901e29b5da3739341ef7b088c61c5887d68909a995f59609d9d3b34a
+SIZE (gitlabhq-gitlabhq-v10.5.7_GH0.tar.gz) = 45334293

Modified: branches/2018Q2/www/gitlab/files/patch-Gemfile
==============================================================================
--- branches/2018Q2/www/gitlab/files/patch-Gemfile	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/files/patch-Gemfile	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,26 +1,15 @@
---- Gemfile.orig	2018-03-16 19:14:20 UTC
+--- Gemfile.orig	2018-04-03 16:35:11 UTC
 +++ Gemfile
-@@ -12,8 +12,8 @@ gem 'sprockets', '~> 3.7.0'
+@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', '~> 3.0.0'
  
  # Supported DBs
 -gem 'mysql2', '~> 0.4.10', group: :mysql
--gem 'pg', '~> 0.18.2', group: :postgres
 +gem 'mysql2', '>= 0.4.10', group: :mysql
-+gem 'pg', '>= 0.18.2', group: :postgres
+ gem 'pg', '~> 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.26.0'
- gem 'grape-route-helpers', '~> 2.1.0'
-@@ -23,7 +23,7 @@ gem 'faraday', '~> 0.12'
- # Authentication libraries
- gem 'devise', '~> 4.2'
- gem 'doorkeeper', '~> 4.2.0'
--gem 'doorkeeper-openid_connect', '~> 1.2.0'
-+gem 'doorkeeper-openid_connect', '~> 1.2'
- gem 'omniauth', '~> 1.4.2'
- gem 'omniauth-auth0', '~> 2.0.0'
- gem 'omniauth-azure-oauth2', '~> 0.0.9'
-@@ -109,7 +109,7 @@ gem 'fog-rackspace', '~> 0.1.1'
+@@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.2.0'
  
  # for Google storage
@@ -29,7 +18,7 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -144,7 +144,7 @@ group :unicorn do
+@@ -148,7 +148,7 @@ group :unicorn do
  end
  
  # State machine
@@ -38,7 +27,7 @@
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -159,7 +159,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
+@@ -163,7 +163,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -47,7 +36,7 @@
  
  # Colored output to console
  gem 'rainbow', '~> 2.2'
-@@ -209,11 +209,11 @@ gem 'kubeclient', '~> 2.2.0'
+@@ -213,11 +213,11 @@ gem 'kubeclient', '~> 2.2.0'
  gem 'd3_rails', '~> 3.5.0'
  
  # Sanitize user input
@@ -61,7 +50,7 @@
  
  # Working with license
  gem 'licensee', '~> 8.7.0'
-@@ -273,7 +273,7 @@ gem 'batch-loader', '~> 1.2.1'
+@@ -280,7 +280,7 @@ gem 'batch-loader', '~> 1.2.1'
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
  gem 'peek-host', '~> 1.0.0'
@@ -70,7 +59,7 @@
  gem 'peek-performance_bar', '~> 1.3.0'
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
-@@ -282,97 +282,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+@@ -289,97 +289,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -79,7 +68,7 @@
 -  gem 'influxdb', '~> 0.2', require: false
 -
    # Prometheus
-   gem 'prometheus-client-mmap', '~> 0.7.0.beta44'
+   gem 'prometheus-client-mmap', '~> 0.9.1'
    gem 'raindrops', '~> 0.18'
  end
  
@@ -114,7 +103,7 @@
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
 -  gem 'rspec_profiling', '~> 0.0.5'
 -  gem 'rspec-set', '~> 0.1.3'
--  gem 'rspec-parameterized'
+-  gem 'rspec-parameterized', require: false
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.7.0'
@@ -130,15 +119,15 @@
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -  gem 'spring-commands-spinach', '~> 1.1.0'
 -
--  gem 'gitlab-styles', '~> 2.2.0', require: false
+-  gem 'gitlab-styles', '~> 2.3', require: false
 -  # Pin these dependencies, otherwise a new rule could break the CI pipelines
--  gem 'rubocop', '~> 0.52.0'
--  gem 'rubocop-rspec', '~> 1.20.1'
+-  gem 'rubocop', '~> 0.52.1'
+-  gem 'rubocop-rspec', '~> 1.22.1'
 -
 -  gem 'scss_lint', '~> 0.56.0', require: false
 -  gem 'haml_lint', '~> 0.26.0', require: false
 -  gem 'simplecov', '~> 0.14.0', require: false
--  gem 'flay', '~> 2.8.0', require: false
+-  gem 'flay', '~> 2.10.0', require: false
 -  gem 'bundler-audit', '~> 0.5.0', require: false
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -168,21 +157,10 @@
  gem 'octokit', '~> 4.6.2'
  
  gem 'mail_room', '~> 0.9.1'
-@@ -403,7 +317,7 @@ group :ed25519 do
- end
+@@ -427,3 +341,6 @@ gem 'grape_logging', '~> 1.7'
  
- # Gitaly GRPC client
--gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly'
-+gem 'gitaly-proto', '>= 0.64.0', require: 'gitaly'
- 
- gem 'toml-rb', '~> 0.3.15', require: false
- 
-@@ -416,5 +330,8 @@ gem 'flipper-active_support_cache_store'
- gem 'lograge', '~> 0.5'
- gem 'grape_logging', '~> 1.7'
- 
-+gem 'rinku'
-+
-+
  # Asset synchronization
  gem 'asset_sync', '~> 2.2.0'
++
++# Make sure this is always present, as it is missing upstream but is required
++gem 'rinku'

Modified: branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,6 +1,15 @@
---- config/gitlab.yml.example.orig	2018-01-22 14:26:07 UTC
+--- config/gitlab.yml.example.orig	2018-02-25 17:42:24 UTC
 +++ config/gitlab.yml.example
-@@ -520,8 +520,8 @@ production: &base
+@@ -517,7 +517,7 @@ production: &base
+   # Gitaly settings
+   gitaly:
+     # Path to the directory containing Gitaly client executables.
+-    client_path: /home/git/gitaly/bin
++    client_path: /usr/local/share/gitaly/bin
+     # Default Gitaly authentication token. Can be overriden per storage. Can
+     # be left blank when Gitaly is running locally on a Unix socket, which
+     # is the normal way to deploy Gitaly.
+@@ -535,8 +535,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -11,7 +20,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -549,12 +549,12 @@ production: &base
+@@ -564,12 +564,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -27,7 +36,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -575,7 +575,7 @@ production: &base
+@@ -590,7 +590,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:

Modified: branches/2018Q2/www/gitlab/files/patch-config_initializers_1__settings.rb
==============================================================================
--- branches/2018Q2/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2018-01-22 14:26:07 UTC
+--- config/initializers/1_settings.rb.orig	2018-02-22 10:46:29 UTC
 +++ config/initializers/1_settings.rb
-@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] 
+@@ -252,12 +252,8 @@ Settings.gitlab['email_subject_suffix'] 
  Settings.gitlab['base_url']   ||= Settings.__send__(:build_base_gitlab_url)
  Settings.gitlab['url']        ||= Settings.__send__(:build_gitlab_url)
  Settings.gitlab['user']       ||= 'git'

Modified: branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab
==============================================================================
--- branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,18 +1,18 @@
---- lib/support/nginx/gitlab.orig	2017-11-14 20:51:25 UTC
+--- lib/support/nginx/gitlab.orig	2018-02-22 10:46:29 UTC
 +++ lib/support/nginx/gitlab
-@@ -17,7 +17,7 @@
- ## See installation.md#using-https for additional HTTPS configuration details.
- 
+@@ -19,7 +19,7 @@
  upstream gitlab-workhorse {
+   # Gitlab socket file,
+   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 +  server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab {
-@@ -110,7 +110,7 @@ server {
-   error_page 502 /502.html;
-   error_page 503 /503.html;
+@@ -114,7 +114,7 @@ server {
    location ~ ^/(404|422|500|502|503)\.html$ {
+     # Location to the Gitlab's public directory,
+     # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
 -    root /home/git/gitlab/public;
 +    root /usr/local/www/gitlab/public;
      internal;

Modified: branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
==============================================================================
--- branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,18 +1,18 @@
---- lib/support/nginx/gitlab-ssl.orig	2017-11-14 20:51:25 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2018-02-22 10:46:29 UTC
 +++ lib/support/nginx/gitlab-ssl
-@@ -21,7 +21,7 @@
- ## See installation.md#using-https for additional HTTPS configuration details.
- 
+@@ -23,7 +23,7 @@
  upstream gitlab-workhorse {
+   # Gitlab socket file,
+   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 +  server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab_ssl {
-@@ -160,7 +160,7 @@ server {
-   error_page 502 /502.html;
-   error_page 503 /503.html;
+@@ -164,7 +164,7 @@ server {
    location ~ ^/(404|422|500|502|503)\.html$ {
+     # Location to the Gitlab's public directory,
+     # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
 -    root /home/git/gitlab/public;
 +    root /usr/local/www/gitlab/public;
      internal;

Modified: branches/2018Q2/www/gitlab/pkg-descr
==============================================================================
--- branches/2018Q2/www/gitlab/pkg-descr	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/pkg-descr	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,3 +1,8 @@
 GitLab is version control for your server.
+Upgrade manual:
+https://gitlab.fechner.net/mfechner/Gitlab-docu/tree/master/update
+
+Install manual:
+https://gitlab.fechner.net/mfechner/Gitlab-docu/tree/master/install
 
 WWW: https://gitlab.com/

Modified: branches/2018Q2/www/gitlab/pkg-message
==============================================================================
--- branches/2018Q2/www/gitlab/pkg-message	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/pkg-message	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1,16 +1,19 @@
+vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv GITLAB vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 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/10.4-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.5-freebsd.md
 
+If you just installed an major upgrade of GitLab, for example you
+switched from 10.4.x to 10.5.x, please follow the instructions in the guide at:
+
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.4-10.5-freebsd.md
+
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
 
-http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/freebsd_patch_versions.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/freebsd_patch_versions.md
 
-If you just installed an major upgrade of GitLab, for example you
-switched from 10.1.x to 10.4.x, please follow the instructions in the guide at:
-
-http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/10.1-to-10.4-freebsd.md
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GITLAB ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Modified: branches/2018Q2/www/gitlab/pkg-plist
==============================================================================
--- branches/2018Q2/www/gitlab/pkg-plist	Wed Apr 18 17:17:07 2018	(r467721)
+++ branches/2018Q2/www/gitlab/pkg-plist	Wed Apr 18 17:18:42 2018	(r467722)
@@ -1873,6 +1873,7 @@
 %%WWWDIR%%/app/assets/images/icon_anchor.svg
 %%WWWDIR%%/app/assets/images/icons.json
 %%WWWDIR%%/app/assets/images/icons.svg
+%%WWWDIR%%/app/assets/images/illustrations/cluster_popover.svg
 %%WWWDIR%%/app/assets/images/illustrations/clusters_empty.svg
 %%WWWDIR%%/app/assets/images/illustrations/convdev/convdev_no_data.svg
 %%WWWDIR%%/app/assets/images/illustrations/convdev/convdev_no_index.svg
@@ -1902,8 +1903,12 @@
 %%WWWDIR%%/app/assets/images/illustrations/monitoring/getting_started.svg
 %%WWWDIR%%/app/assets/images/illustrations/monitoring/loading.svg
 %%WWWDIR%%/app/assets/images/illustrations/monitoring/unable_to_connect.svg
+%%WWWDIR%%/app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg
+%%WWWDIR%%/app/assets/images/illustrations/multi-editor_no_changes_empty.svg
+%%WWWDIR%%/app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg
 %%WWWDIR%%/app/assets/images/illustrations/multi_file_editor_empty.svg
 %%WWWDIR%%/app/assets/images/illustrations/no_commits.svg
+%%WWWDIR%%/app/assets/images/illustrations/pending_job_empty.svg
 %%WWWDIR%%/app/assets/images/illustrations/pipelines_empty.svg
 %%WWWDIR%%/app/assets/images/illustrations/pipelines_failed.svg
 %%WWWDIR%%/app/assets/images/illustrations/pipelines_pending.svg
@@ -1954,9 +1959,7 @@
 %%WWWDIR%%/app/assets/images/touch-icon-iphone-retina.png
 %%WWWDIR%%/app/assets/images/touch-icon-iphone.png
 %%WWWDIR%%/app/assets/images/white-scheme-preview.png
-%%WWWDIR%%/app/assets/javascripts/abuse_reports.js
 %%WWWDIR%%/app/assets/javascripts/activities.js
-%%WWWDIR%%/app/assets/javascripts/admin.js
 %%WWWDIR%%/app/assets/javascripts/ajax_loading_spinner.js
 %%WWWDIR%%/app/assets/javascripts/api.js
 %%WWWDIR%%/app/assets/javascripts/autosave.js
@@ -2002,7 +2005,7 @@
 %%WWWDIR%%/app/assets/javascripts/boards/components/board_blank_state.js
 %%WWWDIR%%/app/assets/javascripts/boards/components/board_card.vue
 %%WWWDIR%%/app/assets/javascripts/boards/components/board_delete.js
-%%WWWDIR%%/app/assets/javascripts/boards/components/board_list.js
+%%WWWDIR%%/app/assets/javascripts/boards/components/board_list.vue
 %%WWWDIR%%/app/assets/javascripts/boards/components/board_new_issue.js
 %%WWWDIR%%/app/assets/javascripts/boards/components/board_sidebar.js
 %%WWWDIR%%/app/assets/javascripts/boards/components/issue_card_inner.js
@@ -2033,10 +2036,11 @@
 %%WWWDIR%%/app/assets/javascripts/branches/branches_delete_modal.js
 %%WWWDIR%%/app/assets/javascripts/breadcrumb.js
 %%WWWDIR%%/app/assets/javascripts/breakpoints.js
-%%WWWDIR%%/app/assets/javascripts/broadcast_message.js
 %%WWWDIR%%/app/assets/javascripts/build_artifacts.js
 %%WWWDIR%%/app/assets/javascripts/build_variables.js
-%%WWWDIR%%/app/assets/javascripts/ci_lint_editor.js
+%%WWWDIR%%/app/assets/javascripts/ci_variable_list/ajax_variable_list.js
+%%WWWDIR%%/app/assets/javascripts/ci_variable_list/ci_variable_list.js
+%%WWWDIR%%/app/assets/javascripts/ci_variable_list/native_form_variable_list.js
 %%WWWDIR%%/app/assets/javascripts/close_reopen_report_toggle.js
 %%WWWDIR%%/app/assets/javascripts/clusters/clusters_bundle.js
 %%WWWDIR%%/app/assets/javascripts/clusters/clusters_index.js
@@ -2050,6 +2054,7 @@
 %%WWWDIR%%/app/assets/javascripts/commit/image_file.js
 %%WWWDIR%%/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
 %%WWWDIR%%/app/assets/javascripts/commit/pipelines/pipelines_table.vue
+%%WWWDIR%%/app/assets/javascripts/commit_merge_requests.js
 %%WWWDIR%%/app/assets/javascripts/commits.js
 %%WWWDIR%%/app/assets/javascripts/commons/bootstrap.js
 %%WWWDIR%%/app/assets/javascripts/commons/index.js
@@ -2064,6 +2069,7 @@
 %%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js
 %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js
 %%WWWDIR%%/app/assets/javascripts/contextual_sidebar.js
+%%WWWDIR%%/app/assets/javascripts/create_item_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/create_label.js
 %%WWWDIR%%/app/assets/javascripts/create_merge_request_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/banner.vue
@@ -2144,6 +2150,9 @@
 %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js
 %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js
 %%WWWDIR%%/app/assets/javascripts/experimental_flags.js
+%%WWWDIR%%/app/assets/javascripts/feature_highlight/feature_highlight.js
+%%WWWDIR%%/app/assets/javascripts/feature_highlight/feature_highlight_helper.js
+%%WWWDIR%%/app/assets/javascripts/feature_highlight/feature_highlight_options.js
 %%WWWDIR%%/app/assets/javascripts/files_comment_button.js
 %%WWWDIR%%/app/assets/javascripts/filterable_list.js
 %%WWWDIR%%/app/assets/javascripts/filtered_search/components/recent_searches_dropdown_content.js
@@ -2198,6 +2207,7 @@
 %%WWWDIR%%/app/assets/javascripts/groups/new_group_child.js
 %%WWWDIR%%/app/assets/javascripts/groups/service/groups_service.js
 %%WWWDIR%%/app/assets/javascripts/groups/store/groups_store.js
+%%WWWDIR%%/app/assets/javascripts/groups/transfer_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/groups_list.js
 %%WWWDIR%%/app/assets/javascripts/groups_select.js
 %%WWWDIR%%/app/assets/javascripts/header.js
@@ -2269,6 +2279,7 @@
 %%WWWDIR%%/app/assets/javascripts/importer_status.js
 %%WWWDIR%%/app/assets/javascripts/init_changes_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/init_issuable_sidebar.js
+%%WWWDIR%%/app/assets/javascripts/init_labels.js
 %%WWWDIR%%/app/assets/javascripts/init_legacy_filters.js
 %%WWWDIR%%/app/assets/javascripts/init_notes.js
 %%WWWDIR%%/app/assets/javascripts/integrations/index.js
@@ -2420,8 +2431,143 @@
 %%WWWDIR%%/app/assets/javascripts/notes/stores/utils.js
 %%WWWDIR%%/app/assets/javascripts/notifications_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/notifications_form.js
-%%WWWDIR%%/app/assets/javascripts/oauth_remember_me.js
 %%WWWDIR%%/app/assets/javascripts/pager.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/admin.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/cohorts/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/cohorts/usage_ping.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/groups/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/groups/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/groups/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/impersonation_tokens/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue
+%%WWWDIR%%/app/assets/javascripts/pages/admin/jobs/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/labels/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/labels/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
+%%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/admin/users/shared/components/delete_user_modal.vue
+%%WWWDIR%%/app/assets/javascripts/pages/admin/users/shared/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/ci/lints/ci_lint_editor.js
+%%WWWDIR%%/app/assets/javascripts/pages/ci/lints/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/constants.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/activity/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/groups/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/issues/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/merge_requests/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/milestones/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/milestones/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/projects/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/todos/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/dashboard/todos/index/todos.js
+%%WWWDIR%%/app/assets/javascripts/pages/explore/groups/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/explore/projects/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/activity/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/group_members/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/issues/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/labels/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/labels/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/labels/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/merge_requests/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/milestones/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/milestones/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/milestones/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/groups/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/help/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/import/fogbugz/new_user_map/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue
+%%WWWDIR%%/app/assets/javascripts/pages/milestones/shared/event_hub.js
+%%WWWDIR%%/app/assets/javascripts/pages/milestones/shared/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/milestones/shared/init_milestones_show.js
+%%WWWDIR%%/app/assets/javascripts/pages/omniauth_callbacks/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/profiles/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/profiles/personal_access_tokens/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/activity/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/artifacts/browse/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/artifacts/file/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/blame/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/blob/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/boards/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/branches/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/branches/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/commit/pipelines/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/commit/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/commits/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/compare/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/compare/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/constants.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/environments/metrics/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/find_file/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/forks/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/imports/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/init_blob.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/init_form.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/issues/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/issues/form.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/issues/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/issues/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/issues/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/labels/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/labels/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/labels/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/merge_requests/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/merge_requests/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/milestones/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/milestones/index/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/milestones/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/milestones/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/pipelines/builds/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/pipelines/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/project.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/project_members/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/releases/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/constants.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/external.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/project_avatar.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/project_new.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/snippets/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/snippets/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/snippets/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/tags/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/tree/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/wikis.js
+%%WWWDIR%%/app/assets/javascripts/pages/search/init_filtered_search.js
+%%WWWDIR%%/app/assets/javascripts/pages/search/show/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/search/show/search.js
+%%WWWDIR%%/app/assets/javascripts/pages/sessions/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/sessions/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/sessions/new/oauth_remember_me.js
+%%WWWDIR%%/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
+%%WWWDIR%%/app/assets/javascripts/pages/sessions/new/username_validator.js
+%%WWWDIR%%/app/assets/javascripts/pages/snippets/edit/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/snippets/form.js
+%%WWWDIR%%/app/assets/javascripts/pages/snippets/new/index.js
+%%WWWDIR%%/app/assets/javascripts/pages/snippets/show/index.js
 %%WWWDIR%%/app/assets/javascripts/pages/users/show/index.js
 %%WWWDIR%%/app/assets/javascripts/pdf/assets/img/bg.gif
 %%WWWDIR%%/app/assets/javascripts/pdf/index.vue
@@ -2434,7 +2580,6 @@
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/icons/intro_illustration.svg
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/pipeline_schedule_form_bundle.js
 %%WWWDIR%%/app/assets/javascripts/pipeline_schedules/pipeline_schedules_index_bundle.js
-%%WWWDIR%%/app/assets/javascripts/pipeline_schedules/setup_pipeline_variable_list.js
 %%WWWDIR%%/app/assets/javascripts/pipelines.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/async_button.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/empty_state.vue
@@ -2454,7 +2599,9 @@
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/pipelines_table.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+%%WWWDIR%%/app/assets/javascripts/pipelines/components/retry_confirmation_modal.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/stage.vue
+%%WWWDIR%%/app/assets/javascripts/pipelines/components/stop_confirmation_modal.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/components/time_ago.vue
 %%WWWDIR%%/app/assets/javascripts/pipelines/event_hub.js
 %%WWWDIR%%/app/assets/javascripts/pipelines/mixins/pipelines.js
@@ -2473,25 +2620,18 @@
 %%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js
 %%WWWDIR%%/app/assets/javascripts/profile/profile.js
 %%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
 %%WWWDIR%%/app/assets/javascripts/project_label_subscription.js
-%%WWWDIR%%/app/assets/javascripts/project_new.js
 %%WWWDIR%%/app/assets/javascripts/project_select.js
 %%WWWDIR%%/app/assets/javascripts/project_select_combo_button.js
 %%WWWDIR%%/app/assets/javascripts/project_visibility.js
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/components/project_feature_setting.vue
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/components/project_setting_row.vue
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/components/settings_panel.vue
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/constants.js
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/external.js
-%%WWWDIR%%/app/assets/javascripts/projects/permissions/index.js
 %%WWWDIR%%/app/assets/javascripts/projects/project_import_gitlab_project.js
 %%WWWDIR%%/app/assets/javascripts/projects/project_new.js
+%%WWWDIR%%/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
+%%WWWDIR%%/app/assets/javascripts/projects/tree/services/commit_pipeline_service.js
 %%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/app.vue
 %%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/projects_list_frequent.vue
 %%WWWDIR%%/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
@@ -2509,13 +2649,11 @@
 %%WWWDIR%%/app/assets/javascripts/protected_branches/index.js
 %%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_create.js
-%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_edit.js
 %%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_edit_list.js
 %%WWWDIR%%/app/assets/javascripts/protected_tags/index.js
 %%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_create.js
-%%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
 %%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_edit.js
 %%WWWDIR%%/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
 %%WWWDIR%%/app/assets/javascripts/raven/index.js
@@ -2535,9 +2673,10 @@
 %%WWWDIR%%/app/assets/javascripts/render_math.js
 %%WWWDIR%%/app/assets/javascripts/render_mermaid.js
 %%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/shared/milestones/form.js
+%%WWWDIR%%/app/assets/javascripts/shared/sessions/u2f.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts_blob.js
 %%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js
@@ -2574,7 +2713,6 @@
 %%WWWDIR%%/app/assets/javascripts/sidebar/sidebar_bundle.js
 %%WWWDIR%%/app/assets/javascripts/sidebar/sidebar_mediator.js
 %%WWWDIR%%/app/assets/javascripts/sidebar/stores/sidebar_store.js
-%%WWWDIR%%/app/assets/javascripts/signin_tabs_memoizer.js
 %%WWWDIR%%/app/assets/javascripts/single_file_diff.js
 %%WWWDIR%%/app/assets/javascripts/smart_interval.js
 %%WWWDIR%%/app/assets/javascripts/snippet/snippet_bundle.js
@@ -2590,7 +2728,7 @@
 %%WWWDIR%%/app/assets/javascripts/test_utils/index.js
 %%WWWDIR%%/app/assets/javascripts/test_utils/simulate_drag.js
 %%WWWDIR%%/app/assets/javascripts/test_utils/simulate_input.js
-%%WWWDIR%%/app/assets/javascripts/todos.js
+%%WWWDIR%%/app/assets/javascripts/toggle_buttons.js
 %%WWWDIR%%/app/assets/javascripts/tree.js
 %%WWWDIR%%/app/assets/javascripts/two_factor_auth.js
 %%WWWDIR%%/app/assets/javascripts/u2f/authenticate.js
@@ -2598,33 +2736,31 @@
 %%WWWDIR%%/app/assets/javascripts/u2f/register.js
 %%WWWDIR%%/app/assets/javascripts/u2f/util.js
 %%WWWDIR%%/app/assets/javascripts/ui_development_kit.js
-%%WWWDIR%%/app/assets/javascripts/usage_ping.js
 %%WWWDIR%%/app/assets/javascripts/user_callout.js
-%%WWWDIR%%/app/assets/javascripts/username_validator.js
 %%WWWDIR%%/app/assets/javascripts/users/activity_calendar.js
 %%WWWDIR%%/app/assets/javascripts/users/index.js
 %%WWWDIR%%/app/assets/javascripts/users/user_tabs.js
 %%WWWDIR%%/app/assets/javascripts/users_select.js
 %%WWWDIR%%/app/assets/javascripts/version_check_image.js
 %%WWWDIR%%/app/assets/javascripts/visibility_select.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.js
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
-%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.js
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
+%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
@@ -2648,6 +2784,7 @@
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_icon.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/clipboard_button.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/commit.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/confirmation_input.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/expand_button.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js
@@ -2676,6 +2813,7 @@
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
 %%WWWDIR%%/app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue
+%%WWWDIR%%/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue
 %%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/toggle_button.vue
@@ -2691,7 +2829,6 @@
 %%WWWDIR%%/app/assets/javascripts/vue_shared/translate.js
 %%WWWDIR%%/app/assets/javascripts/vue_shared/vue_resource_interceptor.js
 %%WWWDIR%%/app/assets/javascripts/webpack.js
-%%WWWDIR%%/app/assets/javascripts/wikis.js
 %%WWWDIR%%/app/assets/javascripts/zen_mode.js
 %%WWWDIR%%/app/assets/stylesheets/application.scss
 %%WWWDIR%%/app/assets/stylesheets/behaviors.scss
@@ -2708,11 +2845,13 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/buttons.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/calendar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/callout.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/ci_variable_list.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/common.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/contextual-sidebar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/dropdowns.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/emoji-sprites.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/emojis.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/feature_highlight.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/files.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/filters.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/flash.scss
@@ -2744,6 +2883,7 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/sidebar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/snippets.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/stacked-progress-bar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/tables.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/tabs.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/timeline.scss
@@ -2829,6 +2969,7 @@
 %%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/gitaly_servers_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
@@ -2987,6 +3128,7 @@
 %%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_locks_api_controller.rb
 %%WWWDIR%%/app/controllers/projects/lfs_storage_controller.rb
 %%WWWDIR%%/app/controllers/projects/mattermosts_controller.rb
 %%WWWDIR%%/app/controllers/projects/merge_requests/application_controller.rb
@@ -3042,6 +3184,7 @@
 %%WWWDIR%%/app/controllers/snippets/notes_controller.rb
 %%WWWDIR%%/app/controllers/snippets_controller.rb
 %%WWWDIR%%/app/controllers/uploads_controller.rb
+%%WWWDIR%%/app/controllers/user_callouts_controller.rb
 %%WWWDIR%%/app/controllers/users_controller.rb
 %%WWWDIR%%/app/finders/README.md
 %%WWWDIR%%/app/finders/access_requests_finder.rb
@@ -3167,6 +3310,7 @@
 %%WWWDIR%%/app/helpers/tree_helper.rb
 %%WWWDIR%%/app/helpers/triggers_helper.rb
 %%WWWDIR%%/app/helpers/u2f_helper.rb
+%%WWWDIR%%/app/helpers/user_callouts_helper.rb
 %%WWWDIR%%/app/helpers/users_helper.rb
 %%WWWDIR%%/app/helpers/version_check_helper.rb
 %%WWWDIR%%/app/helpers/visibility_level_helper.rb
@@ -3181,6 +3325,7 @@
 %%WWWDIR%%/app/mailers/emails/members.rb
 %%WWWDIR%%/app/mailers/emails/merge_requests.rb
 %%WWWDIR%%/app/mailers/emails/notes.rb
+%%WWWDIR%%/app/mailers/emails/pages_domains.rb
 %%WWWDIR%%/app/mailers/emails/pipelines.rb
 %%WWWDIR%%/app/mailers/emails/profile.rb
 %%WWWDIR%%/app/mailers/emails/projects.rb
@@ -3308,6 +3453,7 @@
 %%WWWDIR%%/app/models/concerns/protected_tag_access.rb
 %%WWWDIR%%/app/models/concerns/reactive_caching.rb
 %%WWWDIR%%/app/models/concerns/reactive_service.rb
+%%WWWDIR%%/app/models/concerns/redis_cacheable.rb
 %%WWWDIR%%/app/models/concerns/referable.rb
 %%WWWDIR%%/app/models/concerns/relative_positioning.rb
 %%WWWDIR%%/app/models/concerns/resolvable_discussion.rb
@@ -3326,6 +3472,7 @@
 %%WWWDIR%%/app/models/concerns/throttled_touch.rb
 %%WWWDIR%%/app/models/concerns/time_trackable.rb
 %%WWWDIR%%/app/models/concerns/token_authenticatable.rb
+%%WWWDIR%%/app/models/concerns/triggerable_hooks.rb
 %%WWWDIR%%/app/models/concerns/uniquify.rb
 %%WWWDIR%%/app/models/concerns/valid_attribute.rb
 %%WWWDIR%%/app/models/container_repository.rb
@@ -3395,6 +3542,7 @@
 %%WWWDIR%%/app/models/label_priority.rb
 %%WWWDIR%%/app/models/legacy_diff_discussion.rb
 %%WWWDIR%%/app/models/legacy_diff_note.rb
+%%WWWDIR%%/app/models/lfs_file_lock.rb
 %%WWWDIR%%/app/models/lfs_object.rb
 %%WWWDIR%%/app/models/lfs_objects_project.rb
 %%WWWDIR%%/app/models/list.rb
@@ -3412,6 +3560,7 @@
 %%WWWDIR%%/app/models/network/commit.rb
 %%WWWDIR%%/app/models/network/graph.rb
 %%WWWDIR%%/app/models/note.rb
+%%WWWDIR%%/app/models/notification_reason.rb
 %%WWWDIR%%/app/models/notification_recipient.rb
 %%WWWDIR%%/app/models/notification_setting.rb
 %%WWWDIR%%/app/models/oauth_access_grant.rb
@@ -3510,6 +3659,7 @@
 %%WWWDIR%%/app/models/upload.rb
 %%WWWDIR%%/app/models/user.rb
 %%WWWDIR%%/app/models/user_agent_detail.rb
+%%WWWDIR%%/app/models/user_callout.rb
 %%WWWDIR%%/app/models/user_custom_attribute.rb
 %%WWWDIR%%/app/models/user_synced_attributes_metadata.rb
 %%WWWDIR%%/app/models/users_star_project.rb
@@ -3605,6 +3755,8 @@
 %%WWWDIR%%/app/serializers/group_child_serializer.rb
 %%WWWDIR%%/app/serializers/group_entity.rb
 %%WWWDIR%%/app/serializers/group_serializer.rb
+%%WWWDIR%%/app/serializers/group_variable_entity.rb
+%%WWWDIR%%/app/serializers/group_variable_serializer.rb
 %%WWWDIR%%/app/serializers/issuable_entity.rb
 %%WWWDIR%%/app/serializers/issuable_sidebar_entity.rb
 %%WWWDIR%%/app/serializers/issue_entity.rb
@@ -3614,6 +3766,8 @@
 %%WWWDIR%%/app/serializers/job_group_entity.rb
 %%WWWDIR%%/app/serializers/label_entity.rb
 %%WWWDIR%%/app/serializers/label_serializer.rb
+%%WWWDIR%%/app/serializers/lfs_file_lock_entity.rb
+%%WWWDIR%%/app/serializers/lfs_file_lock_serializer.rb
 %%WWWDIR%%/app/serializers/merge_request_basic_entity.rb
 %%WWWDIR%%/app/serializers/merge_request_basic_serializer.rb
 %%WWWDIR%%/app/serializers/merge_request_create_entity.rb
@@ -3640,6 +3794,8 @@
 %%WWWDIR%%/app/serializers/tree_serializer.rb
 %%WWWDIR%%/app/serializers/user_entity.rb
 %%WWWDIR%%/app/serializers/user_serializer.rb
+%%WWWDIR%%/app/serializers/variable_entity.rb
+%%WWWDIR%%/app/serializers/variable_serializer.rb
 %%WWWDIR%%/app/services/access_token_validation_service.rb
 %%WWWDIR%%/app/services/after_branch_delete_service.rb
 %%WWWDIR%%/app/services/akismet_service.rb
@@ -3668,6 +3824,7 @@
 %%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_trace_artifact_service.rb
 %%WWWDIR%%/app/services/ci/ensure_stage_service.rb
 %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb
 %%WWWDIR%%/app/services/ci/fetch_kubernetes_token_service.rb
@@ -3729,6 +3886,7 @@
 %%WWWDIR%%/app/services/groups/create_service.rb
 %%WWWDIR%%/app/services/groups/destroy_service.rb
 %%WWWDIR%%/app/services/groups/nested_create_service.rb
+%%WWWDIR%%/app/services/groups/transfer_service.rb
 %%WWWDIR%%/app/services/groups/update_service.rb
 %%WWWDIR%%/app/services/ham_service.rb
 %%WWWDIR%%/app/services/import_export_clean_up_service.rb
@@ -3753,6 +3911,10 @@
 %%WWWDIR%%/app/services/labels/promote_service.rb
 %%WWWDIR%%/app/services/labels/transfer_service.rb
 %%WWWDIR%%/app/services/labels/update_service.rb
+%%WWWDIR%%/app/services/lfs/file_modification_handler.rb
+%%WWWDIR%%/app/services/lfs/lock_file_service.rb
+%%WWWDIR%%/app/services/lfs/locks_finder_service.rb
+%%WWWDIR%%/app/services/lfs/unlock_file_service.rb
 %%WWWDIR%%/app/services/mattermost/create_team_service.rb
 %%WWWDIR%%/app/services/members/approve_access_request_service.rb
 %%WWWDIR%%/app/services/members/authorized_destroy_service.rb
@@ -3877,6 +4039,7 @@
 %%WWWDIR%%/app/services/users/refresh_authorized_projects_service.rb
 %%WWWDIR%%/app/services/users/update_service.rb
 %%WWWDIR%%/app/services/validate_new_branch_service.rb
+%%WWWDIR%%/app/services/verify_pages_domain_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
@@ -3894,6 +4057,7 @@
 %%WWWDIR%%/app/uploaders/personal_file_uploader.rb
 %%WWWDIR%%/app/uploaders/records_uploads.rb
 %%WWWDIR%%/app/uploaders/uploader_helper.rb
+%%WWWDIR%%/app/uploaders/workhorse.rb
 %%WWWDIR%%/app/validators/abstract_path_validator.rb
 %%WWWDIR%%/app/validators/addressable_url_validator.rb
 %%WWWDIR%%/app/validators/certificate_key_validator.rb
@@ -3911,7 +4075,6 @@
 %%WWWDIR%%/app/validators/namespace_path_validator.rb
 %%WWWDIR%%/app/validators/project_path_validator.rb
 %%WWWDIR%%/app/validators/url_validator.rb
-%%WWWDIR%%/app/validators/user_path_validator.rb
 %%WWWDIR%%/app/validators/variable_duplicates_validator.rb
 %%WWWDIR%%/app/views/abuse_report_mailer/notify.html.haml
 %%WWWDIR%%/app/views/abuse_report_mailer/notify.text.haml
@@ -3933,7 +4096,6 @@
 %%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/cohorts/_cohorts_table.html.haml
 %%WWWDIR%%/app/views/admin/cohorts/_usage_ping.html.haml
 %%WWWDIR%%/app/views/admin/cohorts/index.html.haml
@@ -3946,6 +4108,7 @@
 %%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/gitaly_servers/index.html.haml
 %%WWWDIR%%/app/views/admin/groups/_form.html.haml
 %%WWWDIR%%/app/views/admin/groups/_group.html.haml
 %%WWWDIR%%/app/views/admin/groups/edit.html.haml
@@ -4007,10 +4170,8 @@
 %%WWWDIR%%/app/views/ci/status/_badge.html.haml
 %%WWWDIR%%/app/views/ci/status/_dropdown_graph_badge.html.haml
 %%WWWDIR%%/app/views/ci/variables/_content.html.haml
-%%WWWDIR%%/app/views/ci/variables/_form.html.haml
 %%WWWDIR%%/app/views/ci/variables/_index.html.haml
-%%WWWDIR%%/app/views/ci/variables/_show.html.haml
-%%WWWDIR%%/app/views/ci/variables/_table.html.haml
+%%WWWDIR%%/app/views/ci/variables/_variable_row.html.haml
 %%WWWDIR%%/app/views/dashboard/_activities.html.haml
 %%WWWDIR%%/app/views/dashboard/_activity_head.html.haml
 %%WWWDIR%%/app/views/dashboard/_groups_head.html.haml
@@ -4151,7 +4312,6 @@
 %%WWWDIR%%/app/views/groups/settings/ci_cd/show.html.haml
 %%WWWDIR%%/app/views/groups/show.atom.builder
 %%WWWDIR%%/app/views/groups/show.html.haml
-%%WWWDIR%%/app/views/groups/variables/show.html.haml
 %%WWWDIR%%/app/views/help/_shortcuts.html.haml
 %%WWWDIR%%/app/views/help/index.html.haml
 %%WWWDIR%%/app/views/help/instance_configuration.html.haml

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

More information about the svn-ports-all mailing list