Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jun 2016 08:36:56 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417194 - in head/www/gitlab: . files
Message-ID:  <201606210836.u5L8ausi065493@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Tue Jun 21 08:36:56 2016
New Revision: 417194
URL: https://svnweb.freebsd.org/changeset/ports/417194

Log:
  www/gitlab: Update from 8.7.5 to 8.8.5
  
  Changelog: https://github.com/gitlabhq/gitlabhq/blob/8-8-stable/CHANGELOG
  
  PR:          209903
  Approved by: swills (mentor)

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

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/Makefile	Tue Jun 21 08:36:56 2016	(r417194)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	8.7.5
+PORTVERSION=	8.8.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -23,8 +23,8 @@ RUN_DEPENDS=	git>=2.7.4:devel/git \
 	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
 	rubygem-pg>=0.18.2:databases/rubygem-pg \
 	rubygem-devise-rails4>=3.5.4:devel/rubygem-devise-rails4 \
+	rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \
 	rubygem-devise-async-rails4>=0.9.0:devel/rubygem-devise-async-rails4 \
-	rubygem-doorkeeper>=2.2.0:security/rubygem-doorkeeper \
 	rubygem-omniauth>=1.3.1: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 \
@@ -39,6 +39,7 @@ RUN_DEPENDS=	git>=2.7.4:devel/git \
 	rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
 	rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
+	rubygem-jwt>=1.0:www/rubygem-jwt \
 	rubygem-recaptcha>=0:devel/rubygem-recaptcha \
 	rubygem-akismet>=2.0:devel/rubygem-akismet \
 	rubygem-devise-two-factor>=2.0.0:security/rubygem-devise-two-factor \
@@ -98,14 +99,14 @@ RUN_DEPENDS=	git>=2.7.4:devel/git \
 	rubygem-asana>=0.4.0:www/rubygem-asana \
 	rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
 	rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
-	rubygem-cal-heatmap-rails-rails4>=3.5.0:www/rubygem-cal-heatmap-rails-rails4 \
+	rubygem-cal-heatmap-rails-rails4>=3.6.0:www/rubygem-cal-heatmap-rails-rails4 \
 	rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
 	rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
 	rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
 	rubygem-loofah>=2.0.3:textproc/rubygem-loofah \
 	rubygem-licensee>=8.0:devel/rubygem-licensee \
 	rubygem-rack-attack>=4.3.1:www/rubygem-rack-attack \
-	rubygem-ace-rails-ap>=2.0.1:www/rubygem-ace-rails-ap \
+	rubygem-ace-rails-ap>=4.0.2:www/rubygem-ace-rails-ap \
 	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
 	rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
 	rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \
@@ -119,14 +120,14 @@ RUN_DEPENDS=	git>=2.7.4:devel/git \
 	rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \
 	rubygem-gon>=6.0.1:www/rubygem-gon \
 	rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \
-	rubygem-jquery-rails4>=4.0.0:www/rubygem-jquery-rails4 \
-	rubygem-jquery-scrollto-rails>=1.4.3:www/rubygem-jquery-scrollto-rails \
+	rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
 	rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
 	rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \
 	rubygem-request_store>=1.3.0:devel/rubygem-request_store \
 	rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
 	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
 	rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
+	rubygem-base32>=0.3.2:converters/rubygem-base32 \
 	rubygem-sentry-raven>=0.15.4:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
 	rubygem-gitlab_meta>=7.0:devel/rubygem-gitlab_meta \
@@ -134,13 +135,14 @@ RUN_DEPENDS=	git>=2.7.4:devel/git \
 	rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \
 	rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \
 	rubygem-octokit>=4.3.0:net/rubygem-octokit \
-	rubygem-mail_room>=0.6.1:mail/rubygem-mail_room \
+	rubygem-mail_room>=0.7:mail/rubygem-mail_room \
 	rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \
 	rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \
 	rubygem-activerecord-session_store>=0.1.0:databases/rubygem-activerecord-session_store \
 	rubygem-nested_form>=0.3.2:www/rubygem-nested_form \
 	rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \
 	rubygem-paranoia>=2.0:databases/rubygem-paranoia \
+	rubygem-health_check>=1.5.1:devel/rubygem-health_check \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 USE=	pgsql=yes
@@ -165,6 +167,7 @@ do-install:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
+	${FIND} ${WRKSRC} -name '*.gitignore' -delete
 	${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
 	${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
 	${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample

Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/distinfo	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463577356
-SHA256 (gitlabhq-gitlabhq-v8.7.5_GH0.tar.gz) = 170029e20425b070b1c96c0480f5a2dc09bc4bc361e487b6572f67b138d6f6cc
-SIZE (gitlabhq-gitlabhq-v8.7.5_GH0.tar.gz) = 17642879
+TIMESTAMP = 1466158783
+SHA256 (gitlabhq-gitlabhq-v8.8.5_GH0.tar.gz) = 385fefd73ea70797ee2b1d9084c0b5a0f90917a7636926537746bd86143e0335
+SIZE (gitlabhq-gitlabhq-v8.8.5_GH0.tar.gz) = 18478664

Modified: head/www/gitlab/files/gitlab.in
==============================================================================
--- head/www/gitlab/files/gitlab.in	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/gitlab.in	Tue Jun 21 08:36:56 2016	(r417194)
@@ -2,8 +2,6 @@
 
 # $FreeBSD$
 
-# $FreeBSD$
-
 ### BEGIN INIT INFO
 # Provides:          gitlab
 # Required-Start:    $local_fs $remote_fs $network $syslog redis-server

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/patch-Gemfile	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,4 +1,4 @@
---- Gemfile.orig	2016-04-27 09:47:33 UTC
+--- Gemfile.orig	2016-06-15 01:41:18 UTC
 +++ Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
@@ -25,14 +25,13 @@
  
  # Authentication libraries
  gem 'devise',                 '~> 3.5.4'
+ gem 'doorkeeper',             '~> 3.1'
 -gem 'devise-async',           '~> 0.9.0'
--gem 'doorkeeper',             '~> 2.2.0'
 +gem 'devise-async',           '>= 0.9.0'
-+gem 'doorkeeper',             '>= 2.2.0'
  gem 'omniauth',               '~> 1.3.1'
  gem 'omniauth-auth0',         '~> 1.4.1'
  gem 'omniauth-azure-oauth2',  '~> 0.0.6'
-@@ -29,25 +28,24 @@ gem 'omniauth-cas3',          '~> 1.1.2'
+@@ -29,13 +28,12 @@ gem 'omniauth-cas3',          '~> 1.1.2'
  gem 'omniauth-facebook',      '~> 3.0.0'
  gem 'omniauth-github',        '~> 1.1.1'
  gem 'omniauth-gitlab',        '~> 1.0.0'
@@ -45,9 +44,10 @@
  gem 'omniauth_crowd',         '~> 2.2.0'
 -gem 'rack-oauth2',            '~> 1.2.1'
 +gem 'rack-oauth2',            '>= 1.2.1'
+ gem 'jwt'
  
  # Spam and anti-bot protection
- gem 'recaptcha', require: 'recaptcha/rails'
+@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -63,7 +63,7 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
-@@ -60,15 +58,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
+@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
  
  # Git Wiki
  # Required manually in config/initializers/gollum.rb to control load order
@@ -83,7 +83,7 @@
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
  # Pagination
-@@ -78,13 +76,13 @@ gem "kaminari", "~> 0.16.3"
+@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
@@ -99,7 +99,7 @@
  gem "unf", '~> 0.1.4'
  
  # Authorization
-@@ -96,13 +94,13 @@ gem "seed-fu", '~> 2.3.5'
+@@ -97,13 +95,13 @@ gem "seed-fu", '~> 2.3.5'
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
  gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
@@ -116,7 +116,7 @@
  gem 'asciidoctor',   '~> 1.5.2'
  gem 'rouge',         '~> 1.10.1'
  
-@@ -111,11 +109,11 @@ gem 'rouge',         '~> 1.10.1'
+@@ -112,16 +110,16 @@ gem 'rouge',         '~> 1.10.1'
  gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
  
  # Diffs
@@ -130,7 +130,13 @@
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
-@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
+ # State machine
+-gem "state_machines-activerecord", '~> 0.3.0'
++gem "state_machines-activerecord", '>= 0.3.0'
+ # Run events after state machine commits
+ gem 'after_commit_queue'
+ 
+@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
  gem "gemnasium-gitlab-service", "~> 0.2"
  
  # Slack integration
@@ -143,7 +149,7 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
-@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
+@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0'
  gem "underscore-rails", "~> 1.8.0"
  
  # Sanitize user input
@@ -152,20 +158,19 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3"
- gem 'licensee', '~> 8.0.0'
+ gem "loofah", "~> 2.0.3"
+ 
+ # Working with license
+-gem 'licensee', '~> 8.0.0'
++gem 'licensee', '>= 8.0.0'
  
  # Protect against bruteforcing
 -gem "rack-attack", '~> 4.3.1'
 +gem "rack-attack", '>= 4.3.1'
  
  # Ace editor
--gem 'ace-rails-ap', '~> 2.0.1'
-+gem 'ace-rails-ap', '>= 2.0.1'
- 
- # Keyboard shortcuts
- gem 'mousetrap-rails', '~> 1.4.6'
-@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3'
+ gem 'ace-rails-ap', '~> 4.0.2'
+@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3'
  
  gem "sass-rails", '~> 5.0.0'
  gem "coffee-rails", '~> 4.1.0'
@@ -179,11 +184,8 @@
  gem 'bootstrap-sass',     '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.2'
  gem 'gitlab_emoji',       '~> 0.3.0'
- gem 'gon',                '~> 6.0.1'
- gem 'jquery-atwho-rails', '~> 1.3.2'
--gem 'jquery-rails',       '~> 4.0.0'
-+gem 'jquery-rails',       '>= 4.0.0'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
+ gem 'jquery-rails',       '~> 4.1.0'
  gem 'jquery-ui-rails',    '~> 5.0.0'
  gem 'raphael-rails',      '~> 2.1.2'
 -gem 'request_store',      '~> 1.3.0'
@@ -192,9 +194,10 @@
  gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
 +gem 'net-ssh',            '>= 3.0.1'
+ gem 'base32',             '~> 0.3.0'
  
  # Sentry integration
- gem 'sentry-raven', '~> 0.15'
+@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15'
  
  gem 'premailer-rails', '~> 1.9.0'
  
@@ -209,8 +212,7 @@
 -  gem "foreman"
 -  gem 'brakeman', '~> 3.2.0', require: false
 -
--  gem "annotate", "~> 2.7.0"
--  gem "letter_opener", '~> 1.1.2'
+-  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'quiet_assets', '~> 1.0.2'
 -  gem 'rerun', '~> 0.11.0'
 -  gem 'bullet', require: false
@@ -237,7 +239,7 @@
 -
 -  gem 'database_cleaner',   '~> 1.4.0'
 -  gem 'factory_girl_rails', '~> 4.6.0'
--  gem 'rspec-rails',        '~> 3.3.0'
+-  gem 'rspec-rails',        '~> 3.4.0'
 -  gem 'rspec-retry'
 -  gem 'spinach-rails',      '~> 0.2.1'
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
@@ -282,7 +284,7 @@
  group :production do
    gem "gitlab_meta", '7.0'
  end
-@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0.
+@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth
@@ -291,5 +293,8 @@
  
  # Soft deletion
  gem "paranoia", "~> 2.0"
-+
+ 
 +gem "rinku"
++
+ # Health check
+ gem 'health_check', '~> 1.5.1'

Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab/files/patch-config_gitlab.yml.example	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2016-04-22 10:01:37 UTC
+--- config/gitlab.yml.example.orig	2016-06-15 01:41:18 UTC
 +++ config/gitlab.yml.example
-@@ -437,11 +437,11 @@ production: &base
+@@ -448,11 +448,11 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -8,13 +8,14 @@
 +    path: /usr/local/share/gitlab-shell/
  
      # REPOS_PATH MUST NOT BE A SYMLINK!!!
-     repos_path: /home/git/repositories/
+-    repos_path: /home/git/repositories/
 -    hooks_path: /home/git/gitlab-shell/hooks/
++    repos_path: /usr/home/git/repositories/
 +    hooks_path: /usr/local/share/gitlab-shell/hooks/
  
      # File that contains the secret key for verifying access for gitlab-shell.
      # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
-@@ -458,7 +458,7 @@ production: &base
+@@ -469,7 +469,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:

Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb
==============================================================================
--- head/www/gitlab/files/patch-config_initializers_1__settings.rb	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/patch-config_initializers_1__settings.rb	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2016-04-22 10:01:37 UTC
+--- config/initializers/1_settings.rb.orig	2016-06-15 01:41:18 UTC
 +++ config/initializers/1_settings.rb
-@@ -167,11 +167,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN
  Settings.gitlab['base_url']   ||= Settings.send(:build_base_gitlab_url)
  Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
  Settings.gitlab['user']       ||= 'git'
@@ -9,7 +9,9 @@
 -rescue ArgumentError # no user configured
 -  '/home/' + Settings.gitlab['user']
 -end
-+Settings.gitlab['user_home']  ||= '/home/' + Settings.gitlab['user']
- Settings.gitlab['time_zone']  ||= nil
+-Settings.gitlab['time_zone'] ||= nil
++Settings.gitlab['user_home']  ||= '/usr/home/' + Settings.gitlab['user']
++Settings.gitlab['time_zone']  ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
  Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
+ Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])

Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab.orig	2016-04-22 10:01:37 UTC
+--- lib/support/nginx/gitlab.orig	2016-06-15 01:41:18 UTC
 +++ lib/support/nginx/gitlab
 @@ -17,7 +17,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
@@ -9,10 +9,10 @@
  }
  
  ## Normal HTTP host
-@@ -62,7 +62,7 @@ server {
-   error_page 500 /500.html;
+@@ -63,7 +63,7 @@ server {
    error_page 502 /502.html;
-   location ~ ^/(404|422|500|502)\.html$ {
+   error_page 503 /503.html;
+   location ~ ^/(404|422|500|502|503)\.html$ {
 -    root /home/git/gitlab/public;
 +    root /usr/local/www/gitlab/public;
      internal;

Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Tue Jun 21 08:36:56 2016	(r417194)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig	2016-04-22 10:01:37 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2016-06-15 01:41:18 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -21,7 +21,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
@@ -9,12 +9,12 @@
  }
  
  ## Redirects all HTTP traffic to the HTTPS host
-@@ -106,7 +106,7 @@ server {
-   error_page 500 /500.html;
+@@ -107,7 +107,7 @@ server {
    error_page 502 /502.html;
-   location ~ ^/(404|422|500|502)\.html$ {
+   error_page 503 /503.html;
+   location ~ ^/(404|422|500|502|503)\.html$ {
 -    root /home/git/gitlab/public;
-+    root /usr/local/www/gitlab/public;
++    root /home/git/gitlab/public; 
      internal;
    }
  }

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Tue Jun 21 08:34:27 2016	(r417193)
+++ head/www/gitlab/pkg-plist	Tue Jun 21 08:36:56 2016	(r417194)
@@ -2,7 +2,6 @@
 %%WWWDIR%%/.flayignore
 %%WWWDIR%%/.foreman
 %%WWWDIR%%/.gitattributes
-%%WWWDIR%%/.gitignore
 %%WWWDIR%%/.gitlab-ci.yml
 %%WWWDIR%%/.hound.yml
 %%WWWDIR%%/.pkgr.yml
@@ -59,12 +58,6 @@
 %%WWWDIR%%/app/assets/images/bg-header.png
 %%WWWDIR%%/app/assets/images/bg_fallback.png
 %%WWWDIR%%/app/assets/images/chosen-sprite.png
-%%WWWDIR%%/app/assets/images/ci/arch.jpg
-%%WWWDIR%%/app/assets/images/ci/favicon.ico
-%%WWWDIR%%/app/assets/images/ci/loader.gif
-%%WWWDIR%%/app/assets/images/ci/no_avatar.png
-%%WWWDIR%%/app/assets/images/ci/rails.png
-%%WWWDIR%%/app/assets/images/ci/service_sample.png
 %%WWWDIR%%/app/assets/images/dark-scheme-preview.png
 %%WWWDIR%%/app/assets/images/diff_note_add.png
 %%WWWDIR%%/app/assets/images/emoji.png
@@ -110,6 +103,7 @@
 %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js.coffee
 %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.coffee
 %%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js.coffee
+%%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee
 %%WWWDIR%%/app/assets/javascripts/blob/blob_license_selector.js.coffee
 %%WWWDIR%%/app/assets/javascripts/blob/edit_blob.js.coffee
 %%WWWDIR%%/app/assets/javascripts/branch-graph.js.coffee
@@ -155,6 +149,7 @@
 %%WWWDIR%%/app/assets/javascripts/lib/jquery.timeago.js
 %%WWWDIR%%/app/assets/javascripts/lib/md5.js
 %%WWWDIR%%/app/assets/javascripts/lib/notify.js.coffee
+%%WWWDIR%%/app/assets/javascripts/lib/type_utility.js.coffee
 %%WWWDIR%%/app/assets/javascripts/lib/url_utility.js.coffee
 %%WWWDIR%%/app/assets/javascripts/lib/utf8_encode.js
 %%WWWDIR%%/app/assets/javascripts/line_highlighter.js.coffee
@@ -184,6 +179,7 @@
 %%WWWDIR%%/app/assets/javascripts/projects_list.js.coffee
 %%WWWDIR%%/app/assets/javascripts/protected_branches.js.coffee
 %%WWWDIR%%/app/assets/javascripts/right_sidebar.js.coffee
+%%WWWDIR%%/app/assets/javascripts/search.js.coffee
 %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js.coffee
 %%WWWDIR%%/app/assets/javascripts/shortcuts.js.coffee
 %%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
@@ -209,6 +205,7 @@
 %%WWWDIR%%/app/assets/stylesheets/application.scss
 %%WWWDIR%%/app/assets/stylesheets/behaviors.scss
 %%WWWDIR%%/app/assets/stylesheets/framework.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/animations.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/avatar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/blocks.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/buttons.scss
@@ -232,6 +229,7 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/markdown_area.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/mixins.scss
 %%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/pagination.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/panels.scss
@@ -250,6 +248,7 @@
 %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_dark.scss
 %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_light.scss
 %%WWWDIR%%/app/assets/stylesheets/highlight/white.scss
+%%WWWDIR%%/app/assets/stylesheets/mailers/repository_push_email.scss
 %%WWWDIR%%/app/assets/stylesheets/notify.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/appearances.scss
@@ -281,11 +280,13 @@
 %%WWWDIR%%/app/assets/stylesheets/pages/note_form.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/notes.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/notifications.scss
+%%WWWDIR%%/app/assets/stylesheets/pages/pipelines.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/profile.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/profiles/preferences.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/projects.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/runners.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/search.scss
+%%WWWDIR%%/app/assets/stylesheets/pages/settings.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/sherlock.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/snippets.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/stat_graph.scss
@@ -309,6 +310,7 @@
 %%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/hooks_controller.rb
 %%WWWDIR%%/app/controllers/admin/identities_controller.rb
 %%WWWDIR%%/app/controllers/admin/impersonations_controller.rb
@@ -355,6 +357,7 @@
 %%WWWDIR%%/app/controllers/groups/milestones_controller.rb
 %%WWWDIR%%/app/controllers/groups/notification_settings_controller.rb
 %%WWWDIR%%/app/controllers/groups_controller.rb
+%%WWWDIR%%/app/controllers/health_check_controller.rb
 %%WWWDIR%%/app/controllers/help_controller.rb
 %%WWWDIR%%/app/controllers/import/base_controller.rb
 %%WWWDIR%%/app/controllers/import/bitbucket_controller.rb
@@ -364,6 +367,7 @@
 %%WWWDIR%%/app/controllers/import/gitorious_controller.rb
 %%WWWDIR%%/app/controllers/import/google_code_controller.rb
 %%WWWDIR%%/app/controllers/invites_controller.rb
+%%WWWDIR%%/app/controllers/jwt_controller.rb
 %%WWWDIR%%/app/controllers/namespaces_controller.rb
 %%WWWDIR%%/app/controllers/oauth/applications_controller.rb
 %%WWWDIR%%/app/controllers/oauth/authorizations_controller.rb
@@ -391,6 +395,7 @@
 %%WWWDIR%%/app/controllers/projects/commit_controller.rb
 %%WWWDIR%%/app/controllers/projects/commits_controller.rb
 %%WWWDIR%%/app/controllers/projects/compare_controller.rb
+%%WWWDIR%%/app/controllers/projects/container_registry_controller.rb
 %%WWWDIR%%/app/controllers/projects/deploy_keys_controller.rb
 %%WWWDIR%%/app/controllers/projects/find_file_controller.rb
 %%WWWDIR%%/app/controllers/projects/forks_controller.rb
@@ -405,6 +410,7 @@
 %%WWWDIR%%/app/controllers/projects/network_controller.rb
 %%WWWDIR%%/app/controllers/projects/notes_controller.rb
 %%WWWDIR%%/app/controllers/projects/notification_settings_controller.rb
+%%WWWDIR%%/app/controllers/projects/pipelines_controller.rb
 %%WWWDIR%%/app/controllers/projects/project_members_controller.rb
 %%WWWDIR%%/app/controllers/projects/protected_branches_controller.rb
 %%WWWDIR%%/app/controllers/projects/raw_controller.rb
@@ -445,6 +451,7 @@
 %%WWWDIR%%/app/finders/milestones_finder.rb
 %%WWWDIR%%/app/finders/notes_finder.rb
 %%WWWDIR%%/app/finders/personal_projects_finder.rb
+%%WWWDIR%%/app/finders/pipelines_finder.rb
 %%WWWDIR%%/app/finders/projects_finder.rb
 %%WWWDIR%%/app/finders/snippets_finder.rb
 %%WWWDIR%%/app/finders/todos_finder.rb
@@ -458,7 +465,6 @@
 %%WWWDIR%%/app/helpers/branches_helper.rb
 %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb
 %%WWWDIR%%/app/helpers/button_helper.rb
-%%WWWDIR%%/app/helpers/ci_badge_helper.rb
 %%WWWDIR%%/app/helpers/ci_status_helper.rb
 %%WWWDIR%%/app/helpers/commits_helper.rb
 %%WWWDIR%%/app/helpers/compare_helper.rb
@@ -541,6 +547,7 @@
 %%WWWDIR%%/app/models/concerns/participable.rb
 %%WWWDIR%%/app/models/concerns/referable.rb
 %%WWWDIR%%/app/models/concerns/sortable.rb
+%%WWWDIR%%/app/models/concerns/statuseable.rb
 %%WWWDIR%%/app/models/concerns/strip_attribute.rb
 %%WWWDIR%%/app/models/concerns/subscribable.rb
 %%WWWDIR%%/app/models/concerns/taskable.rb
@@ -565,6 +572,7 @@
 %%WWWDIR%%/app/models/key.rb
 %%WWWDIR%%/app/models/label.rb
 %%WWWDIR%%/app/models/label_link.rb
+%%WWWDIR%%/app/models/legacy_diff_note.rb
 %%WWWDIR%%/app/models/lfs_object.rb
 %%WWWDIR%%/app/models/lfs_objects_project.rb
 %%WWWDIR%%/app/models/member.rb
@@ -633,8 +641,10 @@
 %%WWWDIR%%/app/models/users_star_project.rb
 %%WWWDIR%%/app/models/wiki_page.rb
 %%WWWDIR%%/app/services/audit_event_service.rb
+%%WWWDIR%%/app/services/auth/container_registry_authentication_service.rb
 %%WWWDIR%%/app/services/base_service.rb
 %%WWWDIR%%/app/services/ci/create_builds_service.rb
+%%WWWDIR%%/app/services/ci/create_pipeline_service.rb
 %%WWWDIR%%/app/services/ci/create_trigger_request_service.rb
 %%WWWDIR%%/app/services/ci/image_for_build_service.rb
 %%WWWDIR%%/app/services/ci/register_build_service.rb
@@ -674,6 +684,7 @@
 %%WWWDIR%%/app/services/issues/move_service.rb
 %%WWWDIR%%/app/services/issues/reopen_service.rb
 %%WWWDIR%%/app/services/issues/update_service.rb
+%%WWWDIR%%/app/services/merge_requests/add_todo_when_build_fails_service.rb
 %%WWWDIR%%/app/services/merge_requests/base_service.rb
 %%WWWDIR%%/app/services/merge_requests/build_service.rb
 %%WWWDIR%%/app/services/merge_requests/close_service.rb
@@ -765,6 +776,7 @@
 %%WWWDIR%%/app/views/admin/groups/index.html.haml
 %%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/hooks/index.html.haml
 %%WWWDIR%%/app/views/admin/identities/_form.html.haml
 %%WWWDIR%%/app/views/admin/identities/_identity.html.haml
@@ -1019,6 +1031,8 @@
 %%WWWDIR%%/app/views/notify/note_issue_email.text.erb
 %%WWWDIR%%/app/views/notify/note_merge_request_email.html.haml
 %%WWWDIR%%/app/views/notify/note_merge_request_email.text.erb
+%%WWWDIR%%/app/views/notify/note_snippet_email.html.haml
+%%WWWDIR%%/app/views/notify/note_snippet_email.text.erb
 %%WWWDIR%%/app/views/notify/project_access_granted_email.html.haml
 %%WWWDIR%%/app/views/notify/project_access_granted_email.text.erb
 %%WWWDIR%%/app/views/notify/project_invite_accepted_email.html.haml
@@ -1112,9 +1126,12 @@
 %%WWWDIR%%/app/views/projects/buttons/_notifications.html.haml
 %%WWWDIR%%/app/views/projects/buttons/_star.html.haml
 %%WWWDIR%%/app/views/projects/ci/builds/_build.html.haml
+%%WWWDIR%%/app/views/projects/ci/commits/_commit.html.haml
 %%WWWDIR%%/app/views/projects/commit/_builds.html.haml
 %%WWWDIR%%/app/views/projects/commit/_change.html.haml
+%%WWWDIR%%/app/views/projects/commit/_ci_commit.html.haml
 %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml
+%%WWWDIR%%/app/views/projects/commit/_ci_stage.html.haml
 %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml
 %%WWWDIR%%/app/views/projects/commit/branches.html.haml
 %%WWWDIR%%/app/views/projects/commit/builds.html.haml
@@ -1130,6 +1147,9 @@
 %%WWWDIR%%/app/views/projects/compare/_form.html.haml
 %%WWWDIR%%/app/views/projects/compare/index.html.haml
 %%WWWDIR%%/app/views/projects/compare/show.html.haml
+%%WWWDIR%%/app/views/projects/container_registry/_header_title.html.haml
+%%WWWDIR%%/app/views/projects/container_registry/_tag.html.haml
+%%WWWDIR%%/app/views/projects/container_registry/index.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
@@ -1162,6 +1182,7 @@
 %%WWWDIR%%/app/views/projects/graphs/languages.html.haml
 %%WWWDIR%%/app/views/projects/graphs/show.html.haml
 %%WWWDIR%%/app/views/projects/group_links/index.html.haml
+%%WWWDIR%%/app/views/projects/hooks/_project_hook.html.haml
 %%WWWDIR%%/app/views/projects/hooks/index.html.haml
 %%WWWDIR%%/app/views/projects/imports/new.html.haml
 %%WWWDIR%%/app/views/projects/imports/show.html.haml
@@ -1244,7 +1265,6 @@
 %%WWWDIR%%/app/views/projects/network/show.json.erb
 %%WWWDIR%%/app/views/projects/new.html.haml
 %%WWWDIR%%/app/views/projects/no_repo.html.haml
-%%WWWDIR%%/app/views/projects/notes/_commit_discussion.html.haml
 %%WWWDIR%%/app/views/projects/notes/_diff_notes_with_reply.html.haml
 %%WWWDIR%%/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
 %%WWWDIR%%/app/views/projects/notes/_discussion.html.haml
@@ -1255,10 +1275,13 @@
 %%WWWDIR%%/app/views/projects/notes/_note.html.haml
 %%WWWDIR%%/app/views/projects/notes/_notes.html.haml
 %%WWWDIR%%/app/views/projects/notes/_notes_with_form.html.haml
-%%WWWDIR%%/app/views/projects/notes/discussions/_active.html.haml
-%%WWWDIR%%/app/views/projects/notes/discussions/_commit.html.haml
-%%WWWDIR%%/app/views/projects/notes/discussions/_diff.html.haml
-%%WWWDIR%%/app/views/projects/notes/discussions/_outdated.html.haml
+%%WWWDIR%%/app/views/projects/notes/discussions/_diff_with_notes.html.haml
+%%WWWDIR%%/app/views/projects/notes/discussions/_notes.html.haml
+%%WWWDIR%%/app/views/projects/pipelines/_header_title.html.haml
+%%WWWDIR%%/app/views/projects/pipelines/_info.html.haml
+%%WWWDIR%%/app/views/projects/pipelines/index.html.haml
+%%WWWDIR%%/app/views/projects/pipelines/new.html.haml
+%%WWWDIR%%/app/views/projects/pipelines/show.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_group_members.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_header_title.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml
@@ -1275,6 +1298,7 @@
 %%WWWDIR%%/app/views/projects/remove_fork.js.haml
 %%WWWDIR%%/app/views/projects/repositories/_download_archive.html.haml
 %%WWWDIR%%/app/views/projects/repositories/_feed.html.haml
+%%WWWDIR%%/app/views/projects/runners/_form.html.haml
 %%WWWDIR%%/app/views/projects/runners/_runner.html.haml
 %%WWWDIR%%/app/views/projects/runners/_shared_runners.html.haml
 %%WWWDIR%%/app/views/projects/runners/_specific_runners.html.haml
@@ -1311,6 +1335,10 @@
 %%WWWDIR%%/app/views/projects/triggers/_trigger.html.haml
 %%WWWDIR%%/app/views/projects/triggers/index.html.haml
 %%WWWDIR%%/app/views/projects/update.js.haml
+%%WWWDIR%%/app/views/projects/variables/_content.html.haml
+%%WWWDIR%%/app/views/projects/variables/_form.html.haml
+%%WWWDIR%%/app/views/projects/variables/_table.html.haml
+%%WWWDIR%%/app/views/projects/variables/index.html.haml
 %%WWWDIR%%/app/views/projects/variables/show.html.haml
 %%WWWDIR%%/app/views/projects/wikis/_form.html.haml
 %%WWWDIR%%/app/views/projects/wikis/_header_title.html.haml
@@ -1457,6 +1485,7 @@
 @(git,,544) %%WWWDIR%%/bin/setup
 @(git,,544) %%WWWDIR%%/bin/spinach
 @(git,,544) %%WWWDIR%%/bin/spring
+@(git,,544) %%WWWDIR%%/bin/teaspoon
 @(git,,544) %%WWWDIR%%/bin/upgrade.rb
 @(git,,544) %%WWWDIR%%/bin/web
 %%WWWDIR%%/config.ru
@@ -1493,11 +1522,11 @@
 %%WWWDIR%%/config/initializers/go_get.rb
 %%WWWDIR%%/config/initializers/gollum.rb
 %%WWWDIR%%/config/initializers/haml.rb
+%%WWWDIR%%/config/initializers/health_check.rb
 %%WWWDIR%%/config/initializers/inflections.rb
 %%WWWDIR%%/config/initializers/kaminari_config.rb
 %%WWWDIR%%/config/initializers/metrics.rb
 %%WWWDIR%%/config/initializers/mime_types.rb
-%%WWWDIR%%/config/initializers/monkey_patch.rb
 %%WWWDIR%%/config/initializers/mysql_ignore_postgresql_options.rb
 %%WWWDIR%%/config/initializers/omniauth.rb
 %%WWWDIR%%/config/initializers/postgresql_limit_fix.rb
@@ -1852,21 +1881,42 @@
 %%WWWDIR%%/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
 %%WWWDIR%%/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb
 %%WWWDIR%%/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb
+%%WWWDIR%%/db/migrate/20160407120251_add_images_enabled_for_project.rb
 %%WWWDIR%%/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb
+%%WWWDIR%%/db/migrate/20160412173416_add_fields_to_ci_commit.rb
+%%WWWDIR%%/db/migrate/20160412173417_update_ci_commit.rb
+%%WWWDIR%%/db/migrate/20160412173418_add_ci_commit_indexes.rb
+%%WWWDIR%%/db/migrate/20160413115152_add_token_to_web_hooks.rb
 %%WWWDIR%%/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb
 %%WWWDIR%%/db/migrate/20160419120017_add_metrics_packet_size.rb
 %%WWWDIR%%/db/migrate/20160421130527_disable_repository_checks.rb
+%%WWWDIR%%/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb
+%%WWWDIR%%/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb
+%%WWWDIR%%/db/migrate/20160508215820_add_type_to_notes.rb
+%%WWWDIR%%/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb
+%%WWWDIR%%/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb
+%%WWWDIR%%/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
 %%WWWDIR%%/db/migrate/limits_to_mysql.rb
 %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
 %%WWWDIR%%/doc/README.md
 %%WWWDIR%%/doc/administration/auth/README.md
 %%WWWDIR%%/doc/administration/auth/ldap.md
+%%WWWDIR%%/doc/administration/container_registry.md
 %%WWWDIR%%/doc/administration/environment_variables.md
+%%WWWDIR%%/doc/administration/high_availability/README.md
+%%WWWDIR%%/doc/administration/high_availability/database.md
+%%WWWDIR%%/doc/administration/high_availability/gitlab.md
+%%WWWDIR%%/doc/administration/high_availability/load_balancer.md
+%%WWWDIR%%/doc/administration/high_availability/nfs.md
+%%WWWDIR%%/doc/administration/high_availability/redis.md
 %%WWWDIR%%/doc/administration/housekeeping.md
 %%WWWDIR%%/doc/administration/img/housekeeping_settings.png
 %%WWWDIR%%/doc/administration/repository_checks.md
 %%WWWDIR%%/doc/administration/restart_gitlab.md
+%%WWWDIR%%/doc/administration/troubleshooting/sidekiq.md
 %%WWWDIR%%/doc/api/README.md
 %%WWWDIR%%/doc/api/branches.md
 %%WWWDIR%%/doc/api/build_triggers.md
@@ -1903,12 +1953,12 @@
 %%WWWDIR%%/doc/ci/build_artifacts/README.md
 %%WWWDIR%%/doc/ci/build_artifacts/img/build_artifacts_browser.png
 %%WWWDIR%%/doc/ci/build_artifacts/img/build_artifacts_browser_button.png
-%%WWWDIR%%/doc/ci/deployment/README.md
 %%WWWDIR%%/doc/ci/docker/README.md
 %%WWWDIR%%/doc/ci/docker/using_docker_build.md
 %%WWWDIR%%/doc/ci/docker/using_docker_images.md
 %%WWWDIR%%/doc/ci/enable_or_disable_ci.md
 %%WWWDIR%%/doc/ci/examples/README.md
+%%WWWDIR%%/doc/ci/examples/deployment/README.md
 %%WWWDIR%%/doc/ci/examples/php.md
 %%WWWDIR%%/doc/ci/examples/test-and-deploy-python-application-to-heroku.md
 %%WWWDIR%%/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
@@ -1940,6 +1990,9 @@
 %%WWWDIR%%/doc/ci/triggers/img/triggers_page.png
 %%WWWDIR%%/doc/ci/variables/README.md
 %%WWWDIR%%/doc/ci/yaml/README.md
+%%WWWDIR%%/doc/container_registry/README.md
+%%WWWDIR%%/doc/container_registry/img/container_registry.png
+%%WWWDIR%%/doc/container_registry/img/project_feature.png
 %%WWWDIR%%/doc/customization/branded_login_page.md
 %%WWWDIR%%/doc/customization/branded_login_page/appearance.png
 %%WWWDIR%%/doc/customization/branded_login_page/custom_sign_in.png
@@ -1959,6 +2012,7 @@
 %%WWWDIR%%/doc/development/instrumentation.md
 %%WWWDIR%%/doc/development/migration_style_guide.md
 %%WWWDIR%%/doc/development/omnibus.md
+%%WWWDIR%%/doc/development/performance.md
 %%WWWDIR%%/doc/development/profiling.md
 %%WWWDIR%%/doc/development/rake_tasks.md
 %%WWWDIR%%/doc/development/scss_styleguide.md
@@ -2050,6 +2104,7 @@
 %%WWWDIR%%/doc/integration/gmail_action_buttons_for_gitlab.md
 %%WWWDIR%%/doc/integration/google.md
 %%WWWDIR%%/doc/integration/img/akismet_settings.png
+%%WWWDIR%%/doc/integration/img/enabled-oauth-sign-in-sources.png
 %%WWWDIR%%/doc/integration/img/facebook_api_keys.png
 %%WWWDIR%%/doc/integration/img/facebook_app_settings.png
 %%WWWDIR%%/doc/integration/img/facebook_website_url.png
@@ -2081,6 +2136,8 @@
 %%WWWDIR%%/doc/markdown/img/logo.png
 %%WWWDIR%%/doc/markdown/markdown.md
 %%WWWDIR%%/doc/migrate_ci_to_ce/README.md
+%%WWWDIR%%/doc/monitoring/health_check.md
+%%WWWDIR%%/doc/monitoring/img/health_check_token.png
 %%WWWDIR%%/doc/monitoring/performance/gitlab_configuration.md
 %%WWWDIR%%/doc/monitoring/performance/grafana_configuration.md
 %%WWWDIR%%/doc/monitoring/performance/img/grafana_dashboard_dropdown.png
@@ -2153,6 +2210,7 @@
 %%WWWDIR%%/doc/security/rack_attack.md
 %%WWWDIR%%/doc/security/reset_root_password.md
 %%WWWDIR%%/doc/security/two_factor_authentication.md
+%%WWWDIR%%/doc/security/user_email_confirmation.md
 %%WWWDIR%%/doc/security/user_file_uploads.md
 %%WWWDIR%%/doc/security/webhooks.md
 %%WWWDIR%%/doc/ssh/README.md
@@ -2204,6 +2262,7 @@
 %%WWWDIR%%/doc/update/8.4-to-8.5.md
 %%WWWDIR%%/doc/update/8.5-to-8.6.md
 %%WWWDIR%%/doc/update/8.6-to-8.7.md
+%%WWWDIR%%/doc/update/8.7-to-8.8.md
 %%WWWDIR%%/doc/update/README.md
 %%WWWDIR%%/doc/update/mysql_to_postgresql.md
 %%WWWDIR%%/doc/update/patch_versions.md
@@ -2403,7 +2462,6 @@
 %%WWWDIR%%/features/project/commits/commits.feature
 %%WWWDIR%%/features/project/commits/diff_comments.feature
 %%WWWDIR%%/features/project/commits/revert.feature
-%%WWWDIR%%/features/project/commits/tags.feature
 %%WWWDIR%%/features/project/commits/user_lookup.feature
 %%WWWDIR%%/features/project/create.feature
 %%WWWDIR%%/features/project/deploy_keys.feature
@@ -2493,7 +2551,6 @@
 %%WWWDIR%%/features/steps/project/commits/commits.rb
 %%WWWDIR%%/features/steps/project/commits/diff_comments.rb
 %%WWWDIR%%/features/steps/project/commits/revert.rb
-%%WWWDIR%%/features/steps/project/commits/tags.rb
 %%WWWDIR%%/features/steps/project/commits/user_lookup.rb
 %%WWWDIR%%/features/steps/project/create.rb
 %%WWWDIR%%/features/steps/project/deploy_keys.rb
@@ -2560,6 +2617,8 @@
 %%WWWDIR%%/fixtures/emojis/digests.json
 %%WWWDIR%%/fixtures/emojis/generate_aliases.rb
 %%WWWDIR%%/fixtures/emojis/index.json
+%%WWWDIR%%/generator_templates/active_record/migration/create_table_migration.rb
+%%WWWDIR%%/generator_templates/active_record/migration/migration.rb
 %%WWWDIR%%/lib/api/api.rb
 %%WWWDIR%%/lib/api/api_guard.rb
 %%WWWDIR%%/lib/api/branches.rb
@@ -2569,6 +2628,7 @@
 %%WWWDIR%%/lib/api/deploy_keys.rb
 %%WWWDIR%%/lib/api/entities.rb
 %%WWWDIR%%/lib/api/files.rb
+%%WWWDIR%%/lib/api/gitignores.rb
 %%WWWDIR%%/lib/api/group_members.rb
 %%WWWDIR%%/lib/api/groups.rb
 %%WWWDIR%%/lib/api/helpers.rb
@@ -2590,6 +2650,7 @@
 %%WWWDIR%%/lib/api/services.rb
 %%WWWDIR%%/lib/api/session.rb
 %%WWWDIR%%/lib/api/settings.rb
+%%WWWDIR%%/lib/api/subscriptions.rb
 %%WWWDIR%%/lib/api/system_hooks.rb
 %%WWWDIR%%/lib/api/tags.rb
 %%WWWDIR%%/lib/api/triggers.rb
@@ -2602,6 +2663,7 @@
 %%WWWDIR%%/lib/backup/files.rb
 %%WWWDIR%%/lib/backup/lfs.rb
 %%WWWDIR%%/lib/backup/manager.rb
+%%WWWDIR%%/lib/backup/registry.rb
 %%WWWDIR%%/lib/backup/repository.rb
 %%WWWDIR%%/lib/backup/uploads.rb
 %%WWWDIR%%/lib/banzai.rb
@@ -2616,6 +2678,7 @@
 %%WWWDIR%%/lib/banzai/filter/external_link_filter.rb
 %%WWWDIR%%/lib/banzai/filter/gollum_tags_filter.rb
 %%WWWDIR%%/lib/banzai/filter/image_link_filter.rb
+%%WWWDIR%%/lib/banzai/filter/inline_diff_filter.rb
 %%WWWDIR%%/lib/banzai/filter/issue_reference_filter.rb
 %%WWWDIR%%/lib/banzai/filter/label_reference_filter.rb
 %%WWWDIR%%/lib/banzai/filter/markdown_filter.rb
@@ -2666,8 +2729,13 @@
 %%WWWDIR%%/lib/ci/gitlab_ci_yaml_processor.rb
 %%WWWDIR%%/lib/ci/model.rb
 %%WWWDIR%%/lib/ci/static_model.rb
-%%WWWDIR%%/lib/ci/status.rb
 %%WWWDIR%%/lib/ci/version_info.rb
+%%WWWDIR%%/lib/container_registry/blob.rb
+%%WWWDIR%%/lib/container_registry/client.rb
+%%WWWDIR%%/lib/container_registry/config.rb
+%%WWWDIR%%/lib/container_registry/registry.rb
+%%WWWDIR%%/lib/container_registry/repository.rb
+%%WWWDIR%%/lib/container_registry/tag.rb
 %%WWWDIR%%/lib/disable_email_interceptor.rb
 %%WWWDIR%%/lib/event_filter.rb
 %%WWWDIR%%/lib/extracts_path.rb
@@ -2701,6 +2769,7 @@
 %%WWWDIR%%/lib/gitlab/contributor.rb
 %%WWWDIR%%/lib/gitlab/current_settings.rb
 %%WWWDIR%%/lib/gitlab/database.rb
+%%WWWDIR%%/lib/gitlab/database/migration_helpers.rb
 %%WWWDIR%%/lib/gitlab/devise_failure.rb
 %%WWWDIR%%/lib/gitlab/diff/file.rb
 %%WWWDIR%%/lib/gitlab/diff/highlight.rb
@@ -2731,8 +2800,10 @@
 %%WWWDIR%%/lib/gitlab/git_post_receive.rb
 %%WWWDIR%%/lib/gitlab/git_ref_validator.rb
 %%WWWDIR%%/lib/gitlab/github_import/base_formatter.rb
+%%WWWDIR%%/lib/gitlab/github_import/branch_formatter.rb
 %%WWWDIR%%/lib/gitlab/github_import/client.rb
 %%WWWDIR%%/lib/gitlab/github_import/comment_formatter.rb
+%%WWWDIR%%/lib/gitlab/github_import/hook_formatter.rb
 %%WWWDIR%%/lib/gitlab/github_import/importer.rb
 %%WWWDIR%%/lib/gitlab/github_import/issue_formatter.rb
 %%WWWDIR%%/lib/gitlab/github_import/label_formatter.rb
@@ -2740,6 +2811,7 @@
 %%WWWDIR%%/lib/gitlab/github_import/project_creator.rb
 %%WWWDIR%%/lib/gitlab/github_import/pull_request_formatter.rb
 %%WWWDIR%%/lib/gitlab/github_import/wiki_formatter.rb
+%%WWWDIR%%/lib/gitlab/gitignore.rb
 %%WWWDIR%%/lib/gitlab/gitlab_import/client.rb
 %%WWWDIR%%/lib/gitlab/gitlab_import/importer.rb
 %%WWWDIR%%/lib/gitlab/gitlab_import/project_creator.rb
@@ -2757,7 +2829,6 @@
 %%WWWDIR%%/lib/gitlab/identifier.rb
 %%WWWDIR%%/lib/gitlab/import_formatter.rb
 %%WWWDIR%%/lib/gitlab/import_sources.rb
-%%WWWDIR%%/lib/gitlab/import_url.rb
 %%WWWDIR%%/lib/gitlab/incoming_email.rb
 %%WWWDIR%%/lib/gitlab/issues_labels.rb
 %%WWWDIR%%/lib/gitlab/key_fingerprint.rb
@@ -2806,6 +2877,8 @@
 %%WWWDIR%%/lib/gitlab/saml/auth_hash.rb
 %%WWWDIR%%/lib/gitlab/saml/config.rb
 %%WWWDIR%%/lib/gitlab/saml/user.rb
+%%WWWDIR%%/lib/gitlab/sanitizers/svg.rb
+%%WWWDIR%%/lib/gitlab/sanitizers/svg/whitelist.rb
 %%WWWDIR%%/lib/gitlab/search_results.rb
 %%WWWDIR%%/lib/gitlab/seeder.rb
 %%WWWDIR%%/lib/gitlab/sherlock.rb
@@ -2826,12 +2899,15 @@
 %%WWWDIR%%/lib/gitlab/upgrader.rb
 %%WWWDIR%%/lib/gitlab/uploads_transfer.rb
 %%WWWDIR%%/lib/gitlab/url_builder.rb
+%%WWWDIR%%/lib/gitlab/url_sanitizer.rb
 %%WWWDIR%%/lib/gitlab/user_access.rb
 %%WWWDIR%%/lib/gitlab/utils.rb
 %%WWWDIR%%/lib/gitlab/version_info.rb
 %%WWWDIR%%/lib/gitlab/visibility_level.rb
 %%WWWDIR%%/lib/gitlab/workhorse.rb
 %%WWWDIR%%/lib/gt_one_coercion.rb
+%%WWWDIR%%/lib/json_web_token/rsa_token.rb
+%%WWWDIR%%/lib/json_web_token/token.rb
 %%WWWDIR%%/lib/omni_auth/request_forgery_protection.rb
 %%WWWDIR%%/lib/repository_cache.rb
 %%WWWDIR%%/lib/rouge/formatters/html_gitlab.rb
@@ -2842,6 +2918,7 @@
 %%WWWDIR%%/lib/support/logrotate/gitlab
 %%WWWDIR%%/lib/support/nginx/gitlab
 %%WWWDIR%%/lib/support/nginx/gitlab-ssl
+%%WWWDIR%%/lib/support/nginx/registry-ssl
 %%WWWDIR%%/lib/tasks/brakeman.rake
 %%WWWDIR%%/lib/tasks/cache.rake
 %%WWWDIR%%/lib/tasks/ci/cleanup.rake
@@ -2866,6 +2943,7 @@
 %%WWWDIR%%/lib/tasks/gitlab/test.rake
 %%WWWDIR%%/lib/tasks/gitlab/two_factor.rake
 %%WWWDIR%%/lib/tasks/gitlab/update_commit_count.rake
+%%WWWDIR%%/lib/tasks/gitlab/update_gitignore.rake
 %%WWWDIR%%/lib/tasks/gitlab/web_hook.rake
 %%WWWDIR%%/lib/tasks/grape.rake
 %%WWWDIR%%/lib/tasks/migrate/add_limits_mysql.rake
@@ -2886,6 +2964,7 @@
 %%WWWDIR%%/public/422.html
 %%WWWDIR%%/public/500.html
 %%WWWDIR%%/public/502.html
+%%WWWDIR%%/public/503.html
 %%WWWDIR%%/public/apple-touch-icon-precomposed.png
 %%WWWDIR%%/public/apple-touch-icon.png
 %%WWWDIR%%/public/ci/build-canceled.svg
@@ -2918,6 +2997,7 @@
 %%WWWDIR%%/spec/controllers/groups/milestones_controller_spec.rb
 %%WWWDIR%%/spec/controllers/groups/notification_settings_controller_spec.rb
 %%WWWDIR%%/spec/controllers/groups_controller_spec.rb
+%%WWWDIR%%/spec/controllers/health_check_controller_spec.rb
 %%WWWDIR%%/spec/controllers/help_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/bitbucket_controller_spec.rb
 %%WWWDIR%%/spec/controllers/import/fogbugz_controller_spec.rb
@@ -2956,6 +3036,7 @@
 %%WWWDIR%%/spec/controllers/projects/tree_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects/uploads_controller_spec.rb
 %%WWWDIR%%/spec/controllers/projects_controller_spec.rb
+%%WWWDIR%%/spec/controllers/registrations_controller_spec.rb
 %%WWWDIR%%/spec/controllers/root_controller_spec.rb
 %%WWWDIR%%/spec/controllers/sent_notifications_controller_spec.rb
 %%WWWDIR%%/spec/controllers/sessions_controller_spec.rb
@@ -3015,6 +3096,7 @@
 %%WWWDIR%%/spec/factories_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_builds_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_disables_two_factor_spec.rb
+%%WWWDIR%%/spec/features/admin/admin_health_check_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_hooks_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_projects_spec.rb
 %%WWWDIR%%/spec/features/admin/admin_runners_spec.rb
@@ -3027,7 +3109,9 @@
 %%WWWDIR%%/spec/features/builds_spec.rb
 %%WWWDIR%%/spec/features/ci_lint_spec.rb
 %%WWWDIR%%/spec/features/commits_spec.rb
-%%WWWDIR%%/spec/features/dashboard_filter_spec.rb
+%%WWWDIR%%/spec/features/container_registry_spec.rb
+%%WWWDIR%%/spec/features/dashboard/label_filter_spec.rb
+%%WWWDIR%%/spec/features/dashboard/user_filters_projects_spec.rb
 %%WWWDIR%%/spec/features/dashboard_issues_spec.rb
 %%WWWDIR%%/spec/features/dashboard_milestones_spec.rb
 %%WWWDIR%%/spec/features/gitlab_flavored_markdown_spec.rb
@@ -3047,18 +3131,26 @@
 %%WWWDIR%%/spec/features/markdown_spec.rb
 %%WWWDIR%%/spec/features/merge_requests/cherry_pick_spec.rb
 %%WWWDIR%%/spec/features/merge_requests/create_new_mr_spec.rb
+%%WWWDIR%%/spec/features/merge_requests/created_from_fork_spec.rb
 %%WWWDIR%%/spec/features/merge_requests/edit_mr_spec.rb
 %%WWWDIR%%/spec/features/merge_requests/filter_by_milestone_spec.rb
 %%WWWDIR%%/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+%%WWWDIR%%/spec/features/merge_requests/toggle_whitespace_changes.rb
 %%WWWDIR%%/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+%%WWWDIR%%/spec/features/milestone_spec.rb
 %%WWWDIR%%/spec/features/notes_on_merge_requests_spec.rb
 %%WWWDIR%%/spec/features/participants_autocomplete_spec.rb
 %%WWWDIR%%/spec/features/password_reset_spec.rb
+%%WWWDIR%%/spec/features/pipelines_spec.rb
 %%WWWDIR%%/spec/features/profile_spec.rb
 %%WWWDIR%%/spec/features/profiles/oauth_applications_spec.rb

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606210836.u5L8ausi065493>