svn commit: r444556 - in head/www/gitlab: . files

Torsten Zuehlsdorff tz at FreeBSD.org
Wed Jun 28 09:16:23 UTC 2017 

Author: tz
Date: Wed Jun 28 09:16:20 2017
New Revision: 444556
URL: https://svnweb.freebsd.org/changeset/ports/444556

Log:
  www/gitlab: Update from 8.17.6 to 9.0.10
  
  Changelog: https://github.com/gitlabhq/gitlabhq/blob/v9.0.10/CHANGELOG.md
  
  Reviewed by: Matthias Fechner <idefix at fechner.net>

Added:
  head/www/gitlab/files/patch-config_initializers_8__gitaly.rb   (contents, props changed)
Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/distinfo
  head/www/gitlab/files/patch-Gemfile
  head/www/gitlab/files/patch-config_database.yml.postgresql
  head/www/gitlab/files/patch-config_gitlab.yml.example
  head/www/gitlab/files/patch-config_initializers_1__settings.rb
  head/www/gitlab/files/patch-config_unicorn.rb.example
  head/www/gitlab/files/patch-lib_support_nginx_gitlab
  head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
  head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake
  head/www/gitlab/pkg-message
  head/www/gitlab/pkg-plist

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/Makefile	Wed Jun 28 09:16:20 2017	(r444556)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	8.17.6
+PORTVERSION=	9.0.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
 CATEGORIES=	www devel
 
 MAINTAINER=	tz at FreeBSD.org
@@ -26,19 +25,21 @@ 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.8.4:devel/git \
-	gitlab-shell>=4.1.1:devel/gitlab-shell\
-	gitlab-workhorse>=1.2.1:www/gitlab-workhorse \
+	gitlab-shell>=5.0.0:devel/gitlab-shell\
+	gitlab-workhorse>=1.4.2:www/gitlab-workhorse \
 	redis>=2.8.23:databases/redis \
-	npm>=0:www/npm \
-	rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \
+	npm>=4.3.0:www/npm \
+	yarn>=0.17.0:www/yarn \
+	rubygem-rails4>=4.2.8: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 \
 	rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
 	rubygem-rugged>=0.24:devel/rubygem-rugged \
 	rubygem-devise>=4.2:devel/rubygem-devise \
-	rubygem-doorkeeper>=4.2.0:security/rubygem-doorkeeper \
-	rubygem-omniauth13>=1.3.2:security/rubygem-omniauth13 \
+	rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
+	rubygem-doorkeeper-openid_connect>=1.1.0:security/rubygem-doorkeeper-openid_connect \
+	rubygem-omniauth>=1.4.2:security/rubygem-omniauth \
 	rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
 	rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
 	rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
@@ -46,11 +47,12 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \
 	rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
 	rubygem-omniauth-google-oauth2>=0.4.1:net/rubygem-omniauth-google-oauth2 \
+	rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
 	rubygem-omniauth-saml>=1.7.0:security/rubygem-omniauth-saml \
 	rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
 	rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
-	rubygem-omniauth-authentiq>=0.2.0:net/rubygem-omniauth-authentiq \
+	rubygem-omniauth-authentiq>=0.3.0:net/rubygem-omniauth-authentiq \
 	rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
 	rubygem-jwt>=1.5.6:www/rubygem-jwt \
 	rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
@@ -65,12 +67,12 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
 	rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
 	rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
-	rubygem-grape>=0.18.0:devel/rubygem-grape \
+	rubygem-grape>=0.19.0:devel/rubygem-grape \
 	rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
 	rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
 	rubygem-hamlit>=2.6.1:www/rubygem-hamlit \
-	rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
+	rubygem-carrierwave>=0.11.0:www/rubygem-carrierwave \
 	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
 	rubygem-fog-aws0>=0.9:net/rubygem-fog-aws0 \
 	rubygem-fog-core>=1.40:devel/rubygem-fog-core \
@@ -84,7 +86,7 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
 	rubygem-deckar01-task_list1>=1.0.6:www/rubygem-deckar01-task_list1 \
 	rubygem-gitlab-markup>=1.5.1:textproc/rubygem-gitlab-markup \
-	rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
+	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
 	rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
 	rubygem-rdoc>=4.2:devel/rubygem-rdoc \
 	rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
@@ -125,7 +127,7 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	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-licensee>=8.7:devel/rubygem-licensee \
 	rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \
 	rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
 	rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
@@ -140,12 +142,11 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
 	rubygem-addressable>=2.3.8:www/rubygem-addressable \
 	rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
-	rubygem-font-awesome-rails-rails4>=4.6.1:devel/rubygem-font-awesome-rails-rails4 \
+	rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \
 	rubygem-gemojione>=3:graphics/rubygem-gemojione \
 	rubygem-gon>=6.1.0:www/rubygem-gon \
 	rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \
 	rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \
-	rubygem-jquery-ui-rails5-rails4>=5.0.0:www/rubygem-jquery-ui-rails5-rails4 \
 	rubygem-request_store>=1.3:devel/rubygem-request_store \
 	rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
 	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
@@ -153,17 +154,17 @@ RUN_DEPENDS=	git>=2.8.4:devel/git \
 	rubygem-base32>=0.3.2:converters/rubygem-base32 \
 	rubygem-sentry-raven>=2.0.0:devel/rubygem-sentry-raven \
 	rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
-	rubygem-newrelic_rpm3>=3.16:devel/rubygem-newrelic_rpm3 \
 	rubygem-octokit>=4.6.2:net/rubygem-octokit \
-	rubygem-mail_room>=0.9.0:mail/rubygem-mail_room \
+	rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
 	rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
 	rubygem-html2text>=0:textproc/rubygem-html2text \
 	rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \
 	rubygem-oauth212>=1.2.0:net/rubygem-oauth212 \
 	rubygem-paranoia>=2.2:databases/rubygem-paranoia \
-	rubygem-health_check22>=2.2.0:devel/rubygem-health_check22 \
+	rubygem-health_check>=2.6.0:devel/rubygem-health_check \
 	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
+	rubygem-gitaly>=0.2.1:net/rubygem-gitaly \
 	rubygem-rinku>=1.7.3:www/rubygem-rinku
 
 PGSQL_RUN_DEPENDS=	rubygem-pg>=0.18.2:databases/rubygem-pg
@@ -208,6 +209,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 
 .include <bsd.port.mk>

Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/distinfo	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494321283
-SHA256 (gitlabhq-gitlabhq-v8.17.6_GH0.tar.gz) = 2636de91a52d9089c37c73c09c93c8fbffc4dcc0b4b6d99eda1dc7a8384678d5
-SIZE (gitlabhq-gitlabhq-v8.17.6_GH0.tar.gz) = 22822276
+TIMESTAMP = 1497354650
+SHA256 (gitlabhq-gitlabhq-v9.0.10_GH0.tar.gz) = 99422056f86a8ada3177cfd4e06985ef7db51494940bebcc08886b61a5221e48
+SIZE (gitlabhq-gitlabhq-v9.0.10_GH0.tar.gz) = 26359584

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-Gemfile	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,12 +1,6 @@
---- Gemfile.orig	2017-05-05 12:53:55 UTC
+--- Gemfile.orig	2017-06-07 20:58:14 UTC
 +++ Gemfile
-@@ -1,44 +1,39 @@
- source 'https://rubygems.org'
- 
--gem 'rails', '4.2.7.1'
-+gem 'rails', '>= 4.2.7.1'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- 
+@@ -6,41 +6,36 @@ gem 'rails-deprecated_sanitizer', '~> 1.
  # Responders respond_to and respond_with
  gem 'responders', '~> 2.0'
  
@@ -22,32 +16,33 @@
 +gem 'default_value_for', '>= 3.0.0'
  
 -gem 'rugged', '~> 0.24.0'
-+gem 'rugged', '~> 0.24'
++gem 'rugged', '>= 0.24.0'
  
  # Authentication libraries
- gem 'devise',                 '~> 4.2'
- gem 'doorkeeper',             '~> 4.2.0'
--gem 'omniauth',               '~> 1.3.2'
-+gem 'omniauth',               '>= 1.3.2'
- gem 'omniauth-auth0',         '~> 1.4.1'
- gem 'omniauth-azure-oauth2',  '~> 0.0.6'
- gem 'omniauth-cas3',          '~> 1.1.2'
- gem 'omniauth-facebook',      '~> 4.0.0'
- gem 'omniauth-github',        '~> 1.1.1'
- gem 'omniauth-gitlab',        '~> 1.0.2'
+ gem 'devise', '~> 4.2'
+ gem 'doorkeeper', '~> 4.2.0'
+ gem 'doorkeeper-openid_connect', '~> 1.1.0'
+-gem 'omniauth', '~> 1.4.2'
++gem 'omniauth', '>= 1.4.2'
+ gem 'omniauth-auth0', '~> 1.4.1'
+ gem 'omniauth-azure-oauth2', '~> 0.0.6'
+ gem 'omniauth-cas3', '~> 1.1.2'
+ gem 'omniauth-facebook', '~> 4.0.0'
+ gem 'omniauth-github', '~> 1.1.1'
+ gem 'omniauth-gitlab', '~> 1.0.2'
 -gem 'omniauth-google-oauth2', '~> 0.4.1'
--gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 +gem 'omniauth-google-oauth2', '>= 0.4.1'
- gem 'omniauth-saml',          '~> 1.7.0'
- gem 'omniauth-shibboleth',    '~> 1.2.0'
--gem 'omniauth-twitter',       '~> 1.2.0'
-+gem 'omniauth-twitter',       '>= 1.2.0'
- gem 'omniauth_crowd',         '~> 2.2.0'
--gem 'omniauth-authentiq',     '~> 0.2.0'
--gem 'rack-oauth2',            '~> 1.2.1'
-+gem 'omniauth-authentiq',     '>= 0.2.0'
-+gem 'rack-oauth2',            '>= 1.2.1'
- gem 'jwt',                    '~> 1.5.6'
+ gem 'omniauth-oauth2-generic', '~> 0.2.2'
+ gem 'omniauth-saml', '~> 1.7.0'
+ gem 'omniauth-shibboleth', '~> 1.2.0'
+-gem 'omniauth-twitter', '~> 1.2.0'
++gem 'omniauth-twitter', '>= 1.2.0'
+ gem 'omniauth_crowd', '~> 2.2.0'
+ gem 'omniauth-authentiq', '~> 0.3.0'
+-gem 'rack-oauth2', '~> 1.2.1'
++gem 'rack-oauth2', '>= 1.2.1'
+ gem 'jwt', '~> 1.5.6'
  
  # Spam and anti-bot protection
 -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@@ -55,7 +50,7 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
-@@ -64,10 +59,10 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -66,7 +61,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
@@ -63,12 +58,8 @@
 +gem 'github-linguist', '>= 4.7.0', require: 'linguist'
  
  # API
--gem 'grape',        '~> 0.18.0'
-+gem 'grape',        '>= 0.18.0'
- gem 'grape-entity', '~> 0.6.0'
- gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
- 
-@@ -75,10 +70,10 @@ gem 'rack-cors',    '~> 0.4.0', require:
+ gem 'grape', '~> 0.19.0'
+@@ -77,13 +72,13 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
  gem 'kaminari', '~> 0.17.0'
  
  # HAML
@@ -76,12 +67,16 @@
 +gem 'hamlit', '>= 2.6.1'
  
  # Files attachments
--gem 'carrierwave', '~> 0.10.0'
-+gem 'carrierwave', '>= 0.10.0'
+-gem 'carrierwave', '~> 0.11.0'
++gem 'carrierwave', '>= 0.11.0'
  
  # Drag and Drop UI
- gem 'dropzonejs-rails', '~> 0.7.1'
-@@ -92,7 +87,7 @@ gem 'fog-openstack', '~> 0.1'
+-gem 'dropzonejs-rails', '~> 0.7.1'
++gem 'dropzonejs-rails', '>= 0.7.1'
+ 
+ # for backups
+ gem 'fog-aws', '~> 0.9'
+@@ -94,7 +89,7 @@ gem 'fog-openstack', '~> 0.1'
  gem 'fog-rackspace', '~> 0.1.1'
  
  # for Google storage
@@ -90,27 +85,26 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -102,34 +97,34 @@ gem 'seed-fu', '~> 2.3.5'
+@@ -104,34 +99,34 @@ gem 'seed-fu', '~> 2.3.5'
  
  # Markdown and HTML processing
- gem 'html-pipeline',        '~> 1.11.0'
--gem 'deckar01-task_list',   '1.0.6', require: 'task_list/railtie'
--gem 'gitlab-markup',        '~> 1.5.1'
--gem 'redcarpet',            '~> 3.3.3'
-+gem 'deckar01-task_list',   '>= 1.0.6', require: 'task_list/railtie'
-+gem 'gitlab-markup',        '>= 1.5.1'
-+gem 'redcarpet',            '>= 3.3.3'
- gem 'RedCloth',             '~> 4.3.2'
- gem 'rdoc',                 '~> 4.2'
- gem 'org-ruby',             '~> 0.9.12'
- gem 'creole',               '~> 0.5.0'
--gem 'wikicloth',            '0.8.1'
-+gem 'wikicloth',            '>= 0.8.1'
- gem 'asciidoctor',          '~> 1.5.2'
+ gem 'html-pipeline', '~> 1.11.0'
+-gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
+-gem 'gitlab-markup', '~> 1.5.1'
++gem 'deckar01-task_list', '>= 1.0.6', require: 'task_list/railtie'
++gem 'gitlab-markup', '>= 1.5.1'
+ gem 'redcarpet', '~> 3.4'
+ gem 'RedCloth', '~> 4.3.2'
+ gem 'rdoc', '~> 4.2'
+ gem 'org-ruby', '~> 0.9.12'
+ gem 'creole', '~> 0.5.0'
+-gem 'wikicloth', '0.8.1'
++gem 'wikicloth', '>= 0.8.1'
+ gem 'asciidoctor', '~> 1.5.2'
 -gem 'asciidoctor-plantuml', '0.0.7'
 +gem 'asciidoctor-plantuml', '>= 0.0.7'
- gem 'rouge',                '~> 2.0'
- gem 'truncato',             '~> 0.7.8'
+ gem 'rouge', '~> 2.0'
+ gem 'truncato', '~> 0.7.8'
  
  # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
  # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -134,7 +128,7 @@
  # Run events after state machine commits
  gem 'after_commit_queue', '~> 1.3.0'
  
-@@ -143,17 +138,17 @@ gem 'redis-namespace', '~> 1.5.2'
+@@ -145,17 +140,17 @@ gem 'redis-namespace', '~> 1.5.2'
  gem 'sidekiq-limit_fetch', '~> 3.4'
  
  # HTTP requests
@@ -155,7 +149,7 @@
  
  # Cache
  gem 'redis-rails', '~> 5.0.1'
-@@ -166,7 +161,7 @@ gem 'connection_pool', '~> 2.0'
+@@ -168,7 +163,7 @@ gem 'connection_pool', '~> 2.0'
  gem 'hipchat', '~> 1.5.0'
  
  # JIRA integration
@@ -164,7 +158,7 @@
  
  # Flowdock integration
  gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -178,13 +173,13 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
+@@ -180,13 +175,13 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
  gem 'slack-notifier', '~> 1.5.1'
  
  # Asana integration
@@ -180,7 +174,7 @@
  
  # d3
  gem 'd3_rails', '~> 3.5.0'
-@@ -193,17 +188,17 @@ gem 'd3_rails', '~> 3.5.0'
+@@ -195,7 +190,7 @@ gem 'd3_rails', '~> 3.5.0'
  gem 'underscore-rails', '~> 1.8.0'
  
  # Sanitize user input
@@ -189,19 +183,16 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
- gem 'loofah', '~> 2.0.3'
+@@ -205,7 +200,7 @@ gem 'loofah', '~> 2.0.3'
+ gem 'licensee', '~> 8.7.0'
  
- # Working with license
--gem 'licensee', '~> 8.0.0'
-+gem 'licensee', '>= 8.0.0'
- 
  # Protect against bruteforcing
 -gem 'rack-attack', '~> 4.4.1'
 +gem 'rack-attack', '>= 4.4.1'
  
  # Ace editor
  gem 'ace-rails-ap', '~> 4.1.0'
-@@ -222,132 +217,53 @@ gem 'chronic', '~> 0.10.2'
+@@ -224,122 +219,41 @@ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
  gem 'webpack-rails', '~> 0.9.9'
@@ -213,24 +204,22 @@
 -gem 'uglifier', '~> 2.7.2'
 +gem 'uglifier', '>= 2.7.2'
  
--gem 'addressable',        '~> 2.3.8'
-+gem 'addressable',        '>= 2.3.8'
- gem 'bootstrap-sass',     '~> 3.3.0'
--gem 'font-awesome-rails', '~> 4.6.1'
-+gem 'font-awesome-rails', '>= 4.6.1'
- gem 'gemojione',          '~> 3.0'
- gem 'gon',                '~> 6.1.0'
+-gem 'addressable', '~> 2.3.8'
++gem 'addressable', '>= 2.3.8'
+ gem 'bootstrap-sass', '~> 3.3.0'
+ gem 'font-awesome-rails', '~> 4.7'
+ gem 'gemojione', '~> 3.0'
+ gem 'gon', '~> 6.1.0'
  gem 'jquery-atwho-rails', '~> 1.3.2'
--gem 'jquery-rails',       '~> 4.1.0'
-+gem 'jquery-rails',       '>= 4.1.0'
- gem 'jquery-ui-rails',    '~> 5.0.0'
--gem 'request_store',      '~> 1.3'
-+gem 'request_store',      '>= 1.3'
- gem 'select2-rails',      '~> 3.5.9'
- gem 'virtus',             '~> 1.0.1'
--gem 'net-ssh',            '~> 3.0.1'
-+gem 'net-ssh',            '>= 3.0.1'
- gem 'base32',             '~> 0.3.0'
+-gem 'jquery-rails', '~> 4.1.0'
+-gem 'request_store', '~> 1.3'
++gem 'jquery-rails', '>= 4.1.0'
++gem 'request_store', '>= 1.3'
+ gem 'select2-rails', '~> 3.5.9'
+ gem 'virtus', '~> 1.0.1'
+-gem 'net-ssh', '~> 3.0.1'
++gem 'net-ssh', '>= 3.0.1'
+ gem 'base32', '~> 0.3.0'
  
  # Sentry integration
 -gem 'sentry-raven', '~> 2.0.0'
@@ -269,13 +258,13 @@
 -  gem 'awesome_print', '~> 1.2.0', require: false
 -  gem 'fuubar', '~> 2.0.0'
 -
--  gem 'database_cleaner',   '~> 1.5.0'
+-  gem 'database_cleaner', '~> 1.5.0'
 -  gem 'factory_girl_rails', '~> 4.7.0'
--  gem 'rspec-rails',        '~> 3.5.0'
--  gem 'rspec-retry',        '~> 0.4.5'
--  gem 'spinach-rails',      '~> 0.2.1'
+-  gem 'rspec-rails', '~> 3.5.0'
+-  gem 'rspec-retry', '~> 0.4.5'
+-  gem 'spinach-rails', '~> 0.2.1'
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
--  gem 'rspec_profiling'
+-  gem 'rspec_profiling', '~> 0.0.5'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.7.0'
@@ -283,18 +272,18 @@
 -  # Generate Fake data
 -  gem 'ffaker', '~> 2.4'
 -
--  gem 'capybara',            '~> 2.6.2'
+-  gem 'capybara', '~> 2.6.2'
 -  gem 'capybara-screenshot', '~> 1.0.0'
--  gem 'poltergeist',         '~> 1.9.0'
+-  gem 'poltergeist', '~> 1.9.0'
 -
--  gem 'spring',                   '~> 1.7.0'
--  gem 'spring-commands-rspec',    '~> 1.0.4'
--  gem 'spring-commands-spinach',  '~> 1.1.0'
+-  gem 'spring', '~> 1.7.0'
+-  gem 'spring-commands-rspec', '~> 1.0.4'
+-  gem 'spring-commands-spinach', '~> 1.1.0'
 -
--  gem 'rubocop', '~> 0.46.0', require: false
--  gem 'rubocop-rspec', '~> 1.9.1', require: false
+-  gem 'rubocop', '~> 0.47.1', require: false
+-  gem 'rubocop-rspec', '~> 1.12.0', require: false
 -  gem 'scss_lint', '~> 0.47.0', require: false
--  gem 'haml_lint', '~> 0.18.2', require: false
+-  gem 'haml_lint', '~> 0.21.0', require: false
 -  gem 'simplecov', '0.12.0', require: false
 -  gem 'flay', '~> 2.6.1', require: false
 -  gem 'bundler-audit', '~> 0.5.0', require: false
@@ -319,12 +308,10 @@
 -  gem 'timecop', '~> 0.8.0'
 -end
 -
- gem 'newrelic_rpm', '~> 3.16'
- 
 -gem 'octokit', '~> 4.6.2'
 +gem 'octokit', '>= 4.6.2'
  
- gem 'mail_room', '~> 0.9.0'
+ gem 'mail_room', '~> 0.9.1'
  
 -gem 'email_reply_trimmer', '~> 0.1'
 +gem 'email_reply_trimmer', '>= 0.1'
@@ -338,13 +325,9 @@
  
  # Soft deletion
  gem 'paranoia', '~> 2.2'
+@@ -353,3 +267,5 @@ gem 'sys-filesystem', '~> 1.1.6'
  
- # Health check
--gem 'health_check', '~> 2.2.0'
-+gem 'health_check', '>= 2.2.0'
- 
- # System information
- gem 'vmstat', '~> 2.3.0'
- gem 'sys-filesystem', '~> 1.1.6'
+ # Gitaly GRPC client
+ gem 'gitaly', '~> 0.2.1'
 +
 +gem 'rinku'

Modified: head/www/gitlab/files/patch-config_database.yml.postgresql
==============================================================================
--- head/www/gitlab/files/patch-config_database.yml.postgresql	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-config_database.yml.postgresql	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,4 +1,4 @@
---- config/database.yml.postgresql.orig	2017-03-19 20:06:47 UTC
+--- config/database.yml.postgresql.orig	2017-06-07 20:58:14 UTC
 +++ config/database.yml.postgresql
 @@ -6,7 +6,7 @@ production:
    encoding: unicode

Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab/files/patch-config_gitlab.yml.example	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,15 +1,15 @@
---- config/gitlab.yml.example.orig	2017-03-19 20:06:47 UTC
+--- config/gitlab.yml.example.orig	2017-06-07 20:58:14 UTC
 +++ config/gitlab.yml.example
-@@ -454,7 +454,7 @@ production: &base
-     # gitlab-shell invokes Dir.pwd inside the repository path and that results
+@@ -472,7 +472,7 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
--      default: /home/git/repositories/
-+      default: /usr/home/git/repositories/
+       default:
+-        path: /home/git/repositories/
++        path: /usr/home/git/repositories/
  
    ## Backup settings
    backup:
-@@ -479,12 +479,12 @@ production: &base
+@@ -499,12 +499,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -25,7 +25,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -497,7 +497,7 @@ production: &base
+@@ -517,7 +517,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:

Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb
==============================================================================
--- head/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2017-03-19 20:06:47 UTC
+--- config/initializers/1_settings.rb.orig	2017-06-07 20:58:14 UTC
 +++ config/initializers/1_settings.rb
-@@ -190,12 +190,8 @@ Settings.gitlab['email_subject_suffix'] 
+@@ -203,12 +203,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'

Added: head/www/gitlab/files/patch-config_initializers_8__gitaly.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab/files/patch-config_initializers_8__gitaly.rb	Wed Jun 28 09:16:20 2017	(r444556)
@@ -0,0 +1,10 @@
+--- config/initializers/8_gitaly.rb.orig	2017-06-07 20:58:14 UTC
++++ config/initializers/8_gitaly.rb
+@@ -1,2 +1 @@
+ # Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
+-Gitlab::GitalyClient.channel unless Rails.env.test?
+--- config/initializers/8_gitaly.rb.orig	2017-06-07 20:58:14 UTC
++++ config/initializers/8_gitaly.rb
+@@ -1,2 +1 @@
+ # Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
+-Gitlab::GitalyClient.channel unless Rails.env.test?

Modified: head/www/gitlab/files/patch-config_unicorn.rb.example
==============================================================================
--- head/www/gitlab/files/patch-config_unicorn.rb.example	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-config_unicorn.rb.example	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,4 +1,4 @@
---- config/unicorn.rb.example.orig	2017-03-19 20:06:47 UTC
+--- config/unicorn.rb.example.orig	2017-06-07 20:58:14 UTC
 +++ config/unicorn.rb.example
 @@ -33,12 +33,12 @@ worker_processes 3
  

Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab.orig	2017-03-19 20:06:47 UTC
+--- lib/support/nginx/gitlab.orig	2017-06-07 20:58:14 UTC
 +++ lib/support/nginx/gitlab
 @@ -17,7 +17,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.

Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig	2017-03-19 20:06:47 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2017-06-07 20:58:14 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -21,7 +21,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
@@ -9,7 +9,7 @@
  }
  
  map $http_upgrade $connection_upgrade_gitlab_ssl {
-@@ -115,7 +115,7 @@ server {
+@@ -118,7 +118,7 @@ server {
    error_page 502 /502.html;
    error_page 503 /503.html;
    location ~ ^/(404|422|500|502|503)\.html$ {

Modified: head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake
==============================================================================
--- head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake	Wed Jun 28 09:16:20 2017	(r444556)
@@ -1,10 +1,10 @@
---- lib/tasks/gitlab/check.rake.orig	2017-03-19 20:06:47 UTC
+--- lib/tasks/gitlab/check.rake.orig	2017-06-07 20:58:14 UTC
 +++ lib/tasks/gitlab/check.rake
-@@ -621,7 +621,7 @@ namespace :gitlab do
+@@ -617,7 +617,7 @@ namespace :gitlab do
      end
  
      def sidekiq_process_count
--      ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
+-      ps_ux, _ = Gitlab::Popen.popen(%w(ps ux))
 +      ps_ux, _ = Gitlab::Popen.popen(%W(ps wux))
        ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
      end

Modified: head/www/gitlab/pkg-message
==============================================================================
--- head/www/gitlab/pkg-message	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/pkg-message	Wed Jun 28 09:16:20 2017	(r444556)
@@ -3,14 +3,14 @@ Gitlab was installed successfully.
 You now need to set up the various components of Gitlab, so please
 follow the instructions in the guide at:
 
-https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/install/installation-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/9.0-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
 
-https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/freebsd_patch_versions.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/freebsd_patch_versions.md
 
 If you just installed an major upgrade of GitLab, for example you
-switched from 8.16.x to 8.17.x, please follow the instructions in the guide at:
+switched from 8.17.x to 9.0.x, please follow the instructions in the guide at:
 
-https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.16-to-8.17-freebsd.md
+http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/8.17-to-9.0-freebsd.md

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Wed Jun 28 09:00:24 2017	(r444555)
+++ head/www/gitlab/pkg-plist	Wed Jun 28 09:16:20 2017	(r444556)
@@ -9,6 +9,7 @@
 %%WWWDIR%%/.gitlab-ci.yml
 %%WWWDIR%%/.gitlab/issue_templates/Bug.md
 %%WWWDIR%%/.gitlab/issue_templates/Feature Proposal.md
+%%WWWDIR%%/.gitlab/issue_templates/Research Proposal.md
 %%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md
 %%WWWDIR%%/.haml-lint.yml
 %%WWWDIR%%/.mailmap
@@ -20,6 +21,7 @@
 %%WWWDIR%%/.scss-lint.yml
 %%WWWDIR%%/CHANGELOG.md
 %%WWWDIR%%/CONTRIBUTING.md
+%%WWWDIR%%/GITALY_SERVER_VERSION
 %%WWWDIR%%/GITLAB_PAGES_VERSION
 %%WWWDIR%%/GITLAB_SHELL_VERSION
 %%WWWDIR%%/GITLAB_WORKHORSE_VERSION
@@ -41,11 +43,1805 @@
 %%WWWDIR%%/app/assets/images/auth_buttons/twitter_64.png
 %%WWWDIR%%/app/assets/images/dark-scheme-preview.png
 %%WWWDIR%%/app/assets/images/emoji.png
+%%WWWDIR%%/app/assets/images/emoji/100.png
+%%WWWDIR%%/app/assets/images/emoji/1234.png
+%%WWWDIR%%/app/assets/images/emoji/1F627.png
+%%WWWDIR%%/app/assets/images/emoji/8ball.png
+%%WWWDIR%%/app/assets/images/emoji/a.png
+%%WWWDIR%%/app/assets/images/emoji/ab.png
+%%WWWDIR%%/app/assets/images/emoji/abc.png
+%%WWWDIR%%/app/assets/images/emoji/abcd.png
+%%WWWDIR%%/app/assets/images/emoji/accept.png
+%%WWWDIR%%/app/assets/images/emoji/aerial_tramway.png
+%%WWWDIR%%/app/assets/images/emoji/airplane.png
+%%WWWDIR%%/app/assets/images/emoji/airplane_arriving.png
+%%WWWDIR%%/app/assets/images/emoji/airplane_departure.png
+%%WWWDIR%%/app/assets/images/emoji/airplane_small.png
+%%WWWDIR%%/app/assets/images/emoji/alarm_clock.png
+%%WWWDIR%%/app/assets/images/emoji/alembic.png
+%%WWWDIR%%/app/assets/images/emoji/alien.png
+%%WWWDIR%%/app/assets/images/emoji/ambulance.png
+%%WWWDIR%%/app/assets/images/emoji/amphora.png
+%%WWWDIR%%/app/assets/images/emoji/anchor.png
+%%WWWDIR%%/app/assets/images/emoji/angel.png
+%%WWWDIR%%/app/assets/images/emoji/angel_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/angel_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/angel_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/angel_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/angel_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/anger.png
+%%WWWDIR%%/app/assets/images/emoji/anger_right.png
+%%WWWDIR%%/app/assets/images/emoji/angry.png
+%%WWWDIR%%/app/assets/images/emoji/ant.png
+%%WWWDIR%%/app/assets/images/emoji/apple.png
+%%WWWDIR%%/app/assets/images/emoji/aquarius.png
+%%WWWDIR%%/app/assets/images/emoji/aries.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_backward.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_double_down.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_double_up.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_down.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_down_small.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_forward.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_heading_down.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_heading_up.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_left.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_lower_left.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_lower_right.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_right.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_right_hook.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_up.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_up_down.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_up_small.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_upper_left.png
+%%WWWDIR%%/app/assets/images/emoji/arrow_upper_right.png
+%%WWWDIR%%/app/assets/images/emoji/arrows_clockwise.png
+%%WWWDIR%%/app/assets/images/emoji/arrows_counterclockwise.png
+%%WWWDIR%%/app/assets/images/emoji/art.png
+%%WWWDIR%%/app/assets/images/emoji/articulated_lorry.png
+%%WWWDIR%%/app/assets/images/emoji/asterisk.png
+%%WWWDIR%%/app/assets/images/emoji/astonished.png
+%%WWWDIR%%/app/assets/images/emoji/athletic_shoe.png
+%%WWWDIR%%/app/assets/images/emoji/atm.png
+%%WWWDIR%%/app/assets/images/emoji/atom.png
+%%WWWDIR%%/app/assets/images/emoji/avocado.png
+%%WWWDIR%%/app/assets/images/emoji/b.png
+%%WWWDIR%%/app/assets/images/emoji/baby.png
+%%WWWDIR%%/app/assets/images/emoji/baby_bottle.png
+%%WWWDIR%%/app/assets/images/emoji/baby_chick.png
+%%WWWDIR%%/app/assets/images/emoji/baby_symbol.png
+%%WWWDIR%%/app/assets/images/emoji/baby_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/baby_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/baby_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/baby_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/baby_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/back.png
+%%WWWDIR%%/app/assets/images/emoji/bacon.png
+%%WWWDIR%%/app/assets/images/emoji/badminton.png
+%%WWWDIR%%/app/assets/images/emoji/baggage_claim.png
+%%WWWDIR%%/app/assets/images/emoji/balloon.png
+%%WWWDIR%%/app/assets/images/emoji/ballot_box.png
+%%WWWDIR%%/app/assets/images/emoji/ballot_box_with_check.png
+%%WWWDIR%%/app/assets/images/emoji/bamboo.png
+%%WWWDIR%%/app/assets/images/emoji/banana.png
+%%WWWDIR%%/app/assets/images/emoji/bangbang.png
+%%WWWDIR%%/app/assets/images/emoji/bank.png
+%%WWWDIR%%/app/assets/images/emoji/bar_chart.png
+%%WWWDIR%%/app/assets/images/emoji/barber.png
+%%WWWDIR%%/app/assets/images/emoji/baseball.png
+%%WWWDIR%%/app/assets/images/emoji/basketball.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/basketball_player_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bat.png
+%%WWWDIR%%/app/assets/images/emoji/bath.png
+%%WWWDIR%%/app/assets/images/emoji/bath_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/bath_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/bath_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/bath_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/bath_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bathtub.png
+%%WWWDIR%%/app/assets/images/emoji/battery.png
+%%WWWDIR%%/app/assets/images/emoji/beach.png
+%%WWWDIR%%/app/assets/images/emoji/beach_umbrella.png
+%%WWWDIR%%/app/assets/images/emoji/bear.png
+%%WWWDIR%%/app/assets/images/emoji/bed.png
+%%WWWDIR%%/app/assets/images/emoji/bee.png
+%%WWWDIR%%/app/assets/images/emoji/beer.png
+%%WWWDIR%%/app/assets/images/emoji/beers.png
+%%WWWDIR%%/app/assets/images/emoji/beetle.png
+%%WWWDIR%%/app/assets/images/emoji/beginner.png
+%%WWWDIR%%/app/assets/images/emoji/bell.png
+%%WWWDIR%%/app/assets/images/emoji/bellhop.png
+%%WWWDIR%%/app/assets/images/emoji/bento.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/bicyclist_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bike.png
+%%WWWDIR%%/app/assets/images/emoji/bikini.png
+%%WWWDIR%%/app/assets/images/emoji/biohazard.png
+%%WWWDIR%%/app/assets/images/emoji/bird.png
+%%WWWDIR%%/app/assets/images/emoji/birthday.png
+%%WWWDIR%%/app/assets/images/emoji/black_circle.png
+%%WWWDIR%%/app/assets/images/emoji/black_heart.png
+%%WWWDIR%%/app/assets/images/emoji/black_joker.png
+%%WWWDIR%%/app/assets/images/emoji/black_large_square.png
+%%WWWDIR%%/app/assets/images/emoji/black_medium_small_square.png
+%%WWWDIR%%/app/assets/images/emoji/black_medium_square.png
+%%WWWDIR%%/app/assets/images/emoji/black_nib.png
+%%WWWDIR%%/app/assets/images/emoji/black_small_square.png
+%%WWWDIR%%/app/assets/images/emoji/black_square_button.png
+%%WWWDIR%%/app/assets/images/emoji/blossom.png
+%%WWWDIR%%/app/assets/images/emoji/blowfish.png
+%%WWWDIR%%/app/assets/images/emoji/blue_book.png
+%%WWWDIR%%/app/assets/images/emoji/blue_car.png
+%%WWWDIR%%/app/assets/images/emoji/blue_heart.png
+%%WWWDIR%%/app/assets/images/emoji/blush.png
+%%WWWDIR%%/app/assets/images/emoji/boar.png
+%%WWWDIR%%/app/assets/images/emoji/bomb.png
+%%WWWDIR%%/app/assets/images/emoji/book.png
+%%WWWDIR%%/app/assets/images/emoji/bookmark.png
+%%WWWDIR%%/app/assets/images/emoji/bookmark_tabs.png
+%%WWWDIR%%/app/assets/images/emoji/books.png
+%%WWWDIR%%/app/assets/images/emoji/boom.png
+%%WWWDIR%%/app/assets/images/emoji/boot.png
+%%WWWDIR%%/app/assets/images/emoji/bouquet.png
+%%WWWDIR%%/app/assets/images/emoji/bow.png
+%%WWWDIR%%/app/assets/images/emoji/bow_and_arrow.png
+%%WWWDIR%%/app/assets/images/emoji/bow_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/bow_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/bow_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/bow_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/bow_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bowling.png
+%%WWWDIR%%/app/assets/images/emoji/boxing_glove.png
+%%WWWDIR%%/app/assets/images/emoji/boy.png
+%%WWWDIR%%/app/assets/images/emoji/boy_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/boy_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/boy_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/boy_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/boy_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bread.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/bride_with_veil_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/bridge_at_night.png
+%%WWWDIR%%/app/assets/images/emoji/briefcase.png
+%%WWWDIR%%/app/assets/images/emoji/broken_heart.png
+%%WWWDIR%%/app/assets/images/emoji/bug.png
+%%WWWDIR%%/app/assets/images/emoji/bulb.png
+%%WWWDIR%%/app/assets/images/emoji/bullettrain_front.png
+%%WWWDIR%%/app/assets/images/emoji/bullettrain_side.png
+%%WWWDIR%%/app/assets/images/emoji/burrito.png
+%%WWWDIR%%/app/assets/images/emoji/bus.png
+%%WWWDIR%%/app/assets/images/emoji/busstop.png
+%%WWWDIR%%/app/assets/images/emoji/bust_in_silhouette.png
+%%WWWDIR%%/app/assets/images/emoji/busts_in_silhouette.png
+%%WWWDIR%%/app/assets/images/emoji/butterfly.png
+%%WWWDIR%%/app/assets/images/emoji/cactus.png
+%%WWWDIR%%/app/assets/images/emoji/cake.png
+%%WWWDIR%%/app/assets/images/emoji/calendar.png
+%%WWWDIR%%/app/assets/images/emoji/calendar_spiral.png
+%%WWWDIR%%/app/assets/images/emoji/call_me.png
+%%WWWDIR%%/app/assets/images/emoji/call_me_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/call_me_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/call_me_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/call_me_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/call_me_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/calling.png
+%%WWWDIR%%/app/assets/images/emoji/camel.png
+%%WWWDIR%%/app/assets/images/emoji/camera.png
+%%WWWDIR%%/app/assets/images/emoji/camera_with_flash.png
+%%WWWDIR%%/app/assets/images/emoji/camping.png
+%%WWWDIR%%/app/assets/images/emoji/cancer.png
+%%WWWDIR%%/app/assets/images/emoji/candle.png
+%%WWWDIR%%/app/assets/images/emoji/candy.png
+%%WWWDIR%%/app/assets/images/emoji/canoe.png
+%%WWWDIR%%/app/assets/images/emoji/capital_abcd.png
+%%WWWDIR%%/app/assets/images/emoji/capricorn.png
+%%WWWDIR%%/app/assets/images/emoji/card_box.png
+%%WWWDIR%%/app/assets/images/emoji/card_index.png
+%%WWWDIR%%/app/assets/images/emoji/carousel_horse.png
+%%WWWDIR%%/app/assets/images/emoji/carrot.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/cartwheel_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/cat.png
+%%WWWDIR%%/app/assets/images/emoji/cat2.png
+%%WWWDIR%%/app/assets/images/emoji/cd.png
+%%WWWDIR%%/app/assets/images/emoji/chains.png
+%%WWWDIR%%/app/assets/images/emoji/champagne.png
+%%WWWDIR%%/app/assets/images/emoji/champagne_glass.png
+%%WWWDIR%%/app/assets/images/emoji/chart.png
+%%WWWDIR%%/app/assets/images/emoji/chart_with_downwards_trend.png
+%%WWWDIR%%/app/assets/images/emoji/chart_with_upwards_trend.png
+%%WWWDIR%%/app/assets/images/emoji/checkered_flag.png
+%%WWWDIR%%/app/assets/images/emoji/cheese.png
+%%WWWDIR%%/app/assets/images/emoji/cherries.png
+%%WWWDIR%%/app/assets/images/emoji/cherry_blossom.png
+%%WWWDIR%%/app/assets/images/emoji/chestnut.png
+%%WWWDIR%%/app/assets/images/emoji/chicken.png
+%%WWWDIR%%/app/assets/images/emoji/children_crossing.png
+%%WWWDIR%%/app/assets/images/emoji/chipmunk.png
+%%WWWDIR%%/app/assets/images/emoji/chocolate_bar.png
+%%WWWDIR%%/app/assets/images/emoji/christmas_tree.png
+%%WWWDIR%%/app/assets/images/emoji/church.png
+%%WWWDIR%%/app/assets/images/emoji/cinema.png
+%%WWWDIR%%/app/assets/images/emoji/circus_tent.png
+%%WWWDIR%%/app/assets/images/emoji/city_dusk.png
+%%WWWDIR%%/app/assets/images/emoji/city_sunset.png
+%%WWWDIR%%/app/assets/images/emoji/cityscape.png
+%%WWWDIR%%/app/assets/images/emoji/cl.png
+%%WWWDIR%%/app/assets/images/emoji/clap.png
+%%WWWDIR%%/app/assets/images/emoji/clap_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/clap_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/clap_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/clap_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/clap_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/clapper.png
+%%WWWDIR%%/app/assets/images/emoji/classical_building.png
+%%WWWDIR%%/app/assets/images/emoji/clipboard.png
+%%WWWDIR%%/app/assets/images/emoji/clock.png
+%%WWWDIR%%/app/assets/images/emoji/clock1.png
+%%WWWDIR%%/app/assets/images/emoji/clock10.png
+%%WWWDIR%%/app/assets/images/emoji/clock1030.png
+%%WWWDIR%%/app/assets/images/emoji/clock11.png
+%%WWWDIR%%/app/assets/images/emoji/clock1130.png
+%%WWWDIR%%/app/assets/images/emoji/clock12.png
+%%WWWDIR%%/app/assets/images/emoji/clock1230.png
+%%WWWDIR%%/app/assets/images/emoji/clock130.png
+%%WWWDIR%%/app/assets/images/emoji/clock2.png
+%%WWWDIR%%/app/assets/images/emoji/clock230.png
+%%WWWDIR%%/app/assets/images/emoji/clock3.png
+%%WWWDIR%%/app/assets/images/emoji/clock330.png
+%%WWWDIR%%/app/assets/images/emoji/clock4.png
+%%WWWDIR%%/app/assets/images/emoji/clock430.png
+%%WWWDIR%%/app/assets/images/emoji/clock5.png
+%%WWWDIR%%/app/assets/images/emoji/clock530.png
+%%WWWDIR%%/app/assets/images/emoji/clock6.png
+%%WWWDIR%%/app/assets/images/emoji/clock630.png
+%%WWWDIR%%/app/assets/images/emoji/clock7.png
+%%WWWDIR%%/app/assets/images/emoji/clock730.png
+%%WWWDIR%%/app/assets/images/emoji/clock8.png
+%%WWWDIR%%/app/assets/images/emoji/clock830.png
+%%WWWDIR%%/app/assets/images/emoji/clock9.png
+%%WWWDIR%%/app/assets/images/emoji/clock930.png
+%%WWWDIR%%/app/assets/images/emoji/closed_book.png
+%%WWWDIR%%/app/assets/images/emoji/closed_lock_with_key.png
+%%WWWDIR%%/app/assets/images/emoji/closed_umbrella.png
+%%WWWDIR%%/app/assets/images/emoji/cloud.png
+%%WWWDIR%%/app/assets/images/emoji/cloud_lightning.png
+%%WWWDIR%%/app/assets/images/emoji/cloud_rain.png
+%%WWWDIR%%/app/assets/images/emoji/cloud_snow.png
+%%WWWDIR%%/app/assets/images/emoji/cloud_tornado.png
+%%WWWDIR%%/app/assets/images/emoji/clown.png
+%%WWWDIR%%/app/assets/images/emoji/clubs.png
+%%WWWDIR%%/app/assets/images/emoji/cocktail.png
+%%WWWDIR%%/app/assets/images/emoji/coffee.png
+%%WWWDIR%%/app/assets/images/emoji/coffin.png
+%%WWWDIR%%/app/assets/images/emoji/cold_sweat.png
+%%WWWDIR%%/app/assets/images/emoji/comet.png
+%%WWWDIR%%/app/assets/images/emoji/compression.png
+%%WWWDIR%%/app/assets/images/emoji/computer.png
+%%WWWDIR%%/app/assets/images/emoji/confetti_ball.png
+%%WWWDIR%%/app/assets/images/emoji/confounded.png
+%%WWWDIR%%/app/assets/images/emoji/confused.png
+%%WWWDIR%%/app/assets/images/emoji/congratulations.png
+%%WWWDIR%%/app/assets/images/emoji/construction.png
+%%WWWDIR%%/app/assets/images/emoji/construction_site.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/construction_worker_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/control_knobs.png
+%%WWWDIR%%/app/assets/images/emoji/convenience_store.png
+%%WWWDIR%%/app/assets/images/emoji/cookie.png
+%%WWWDIR%%/app/assets/images/emoji/cooking.png
+%%WWWDIR%%/app/assets/images/emoji/cool.png
+%%WWWDIR%%/app/assets/images/emoji/cop.png
+%%WWWDIR%%/app/assets/images/emoji/cop_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/cop_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/cop_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/cop_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/cop_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/copyright.png
+%%WWWDIR%%/app/assets/images/emoji/corn.png
+%%WWWDIR%%/app/assets/images/emoji/couch.png
+%%WWWDIR%%/app/assets/images/emoji/couple.png
+%%WWWDIR%%/app/assets/images/emoji/couple_mm.png
+%%WWWDIR%%/app/assets/images/emoji/couple_with_heart.png
+%%WWWDIR%%/app/assets/images/emoji/couple_ww.png
+%%WWWDIR%%/app/assets/images/emoji/couplekiss.png
+%%WWWDIR%%/app/assets/images/emoji/cow.png
+%%WWWDIR%%/app/assets/images/emoji/cow2.png
+%%WWWDIR%%/app/assets/images/emoji/cowboy.png
+%%WWWDIR%%/app/assets/images/emoji/crab.png
+%%WWWDIR%%/app/assets/images/emoji/crayon.png
+%%WWWDIR%%/app/assets/images/emoji/credit_card.png
+%%WWWDIR%%/app/assets/images/emoji/crescent_moon.png
+%%WWWDIR%%/app/assets/images/emoji/cricket.png
+%%WWWDIR%%/app/assets/images/emoji/crocodile.png
+%%WWWDIR%%/app/assets/images/emoji/croissant.png
+%%WWWDIR%%/app/assets/images/emoji/cross.png
+%%WWWDIR%%/app/assets/images/emoji/crossed_flags.png
+%%WWWDIR%%/app/assets/images/emoji/crossed_swords.png
+%%WWWDIR%%/app/assets/images/emoji/crown.png
+%%WWWDIR%%/app/assets/images/emoji/cruise_ship.png
+%%WWWDIR%%/app/assets/images/emoji/cry.png
+%%WWWDIR%%/app/assets/images/emoji/crying_cat_face.png
+%%WWWDIR%%/app/assets/images/emoji/crystal_ball.png
+%%WWWDIR%%/app/assets/images/emoji/cucumber.png
+%%WWWDIR%%/app/assets/images/emoji/cupid.png
+%%WWWDIR%%/app/assets/images/emoji/curly_loop.png
+%%WWWDIR%%/app/assets/images/emoji/currency_exchange.png
+%%WWWDIR%%/app/assets/images/emoji/curry.png
+%%WWWDIR%%/app/assets/images/emoji/custard.png
+%%WWWDIR%%/app/assets/images/emoji/customs.png
+%%WWWDIR%%/app/assets/images/emoji/cyclone.png
+%%WWWDIR%%/app/assets/images/emoji/dagger.png
+%%WWWDIR%%/app/assets/images/emoji/dancer.png
+%%WWWDIR%%/app/assets/images/emoji/dancer_tone1.png
+%%WWWDIR%%/app/assets/images/emoji/dancer_tone2.png
+%%WWWDIR%%/app/assets/images/emoji/dancer_tone3.png
+%%WWWDIR%%/app/assets/images/emoji/dancer_tone4.png
+%%WWWDIR%%/app/assets/images/emoji/dancer_tone5.png
+%%WWWDIR%%/app/assets/images/emoji/dancers.png
+%%WWWDIR%%/app/assets/images/emoji/dango.png
+%%WWWDIR%%/app/assets/images/emoji/dark_sunglasses.png
+%%WWWDIR%%/app/assets/images/emoji/dart.png
+%%WWWDIR%%/app/assets/images/emoji/dash.png
+%%WWWDIR%%/app/assets/images/emoji/date.png
+%%WWWDIR%%/app/assets/images/emoji/deciduous_tree.png
+%%WWWDIR%%/app/assets/images/emoji/deer.png
+%%WWWDIR%%/app/assets/images/emoji/department_store.png

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

More information about the svn-ports-all mailing list