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

Kurt Jaeger pi at FreeBSD.org
Wed Apr 13 16:46:45 UTC 2016 

Author: pi
Date: Wed Apr 13 16:46:42 2016
New Revision: 413219
URL: https://svnweb.freebsd.org/changeset/ports/413219

Log:
  www/gitlab: 8.5.5 -> 8.6.5
  
  PR:		208511
  Submitted by:	Torsten Zuehlsdorff <ports at toco-domains.de> (maintainer)
  Reviewed by:	xmj, miks.mikelsons at gmail.com

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/pkg-message
  head/www/gitlab/pkg-plist

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/Makefile	Wed Apr 13 16:46:42 2016	(r413219)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	8.5.5
+PORTVERSION=	8.6.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -19,13 +19,14 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 	rubygem-rails4>=4.2.5.2:www/rubygem-rails4 \
 	rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
 	rubygem-responders>=2.0:www/rubygem-responders \
-	rubygem-sprockets>=2.12.3:devel/rubygem-sprockets \
+	rubygem-sprockets3>=3.3.5:devel/rubygem-sprockets3 \
 	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-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 \
 	rubygem-omniauth-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \
 	rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \
@@ -33,7 +34,7 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 	rubygem-omniauth-github>=1.1.1:net/rubygem-omniauth-github \
 	rubygem-omniauth-gitlab>=1.0.0:security/rubygem-omniauth-gitlab \
 	rubygem-omniauth-google-oauth2>=0.2.0:net/rubygem-omniauth-google-oauth2 \
-	rubygem-omniauth-saml>=1.4.2:security/rubygem-omniauth-saml \
+	rubygem-omniauth-saml>=1.5.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 \
@@ -44,16 +45,17 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 	rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
 	rubygem-attr_encrypted>=1.3.4:security/rubygem-attr_encrypted \
 	rubygem-browser>=1.0.0:www/rubygem-browser \
-	rubygem-gitlab_git>=8.2:devel/rubygem-gitlab_git \
+	rubygem-gitlab_git>=10.0:devel/rubygem-gitlab_git \
 	rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-gollum-lib>=4.1.0:www/rubygem-gollum-lib \
+	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.13.0:devel/rubygem-grape \
 	rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
 	rubygem-kaminari-rails4>=0.16.3:www/rubygem-kaminari-rails4 \
 	rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \
-	rubygem-carrierwave>=0.9.0:www/rubygem-carrierwave \
+	rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
 	rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
 	rubygem-fog>=1.36:devel/rubygem-fog \
 	rubygem-unf>=0.1.4:textproc/rubygem-unf \
@@ -72,7 +74,7 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 	rubygem-rouge>=1.10.1:textproc/rubygem-rouge \
 	rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri  \
 	rubygem-diffy>=3.0.3:textproc/rubygem-diffy \
-	rubygem-unicorn>=4.8.2:www/rubygem-unicorn \
+	rubygem-unicorn>=4.9.0:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.2:www/rubygem-unicorn-worker-killer \
 	rubygem-state_machines-activerecord>=0.3.0:databases/rubygem-state_machines-activerecord \
 	rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \
@@ -117,13 +119,13 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 	rubygem-jquery-rails4>=4.0.0:www/rubygem-jquery-rails4 \
 	rubygem-jquery-scrollto-rails>=1.4.3:www/rubygem-jquery-scrollto-rails \
 	rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
-	rubygem-nprogress-rails>=0.1.6.7:devel/rubygem-nprogress-rails \
 	rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \
 	rubygem-request_store>=1.2.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-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 \
 	rubygem-newrelic_rpm>=3.9.4.245:devel/rubygem-newrelic_rpm \
 	rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \
@@ -141,6 +143,8 @@ RUN_DEPENDS=	git>=2.4.3:devel/git \
 USE=	pgsql=yes
 WANT=	pgsql=9.1+
 
+USE_RUBY=	yes
+
 USE_RC_SUBR=	gitlab
 USE_GITHUB=	yes
 GH_ACCOUNT=	gitlabhq
@@ -168,7 +172,6 @@ do-install:
 
 post-install:
 	${MKDIR} ${STAGEDIR}/home/git/repositories
-	${MKDIR} ${STAGEDIR}/home/git/gitlab-satellites
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions

Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/distinfo	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,2 +1,2 @@
-SHA256 (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 859ec6142095d459b1587616df6c83063e87a8c7417ab8606100588525d03e2d
-SIZE (gitlabhq-gitlabhq-v8.5.5_GH0.tar.gz) = 15179973
+SHA256 (gitlabhq-gitlabhq-v8.6.5_GH0.tar.gz) = e644def0fac1665263caa3548c240c57112f55071eb7f50f42d37945bff064fd
+SIZE (gitlabhq-gitlabhq-v8.6.5_GH0.tar.gz) = 16089775

Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-Gemfile	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,4 +1,4 @@
---- Gemfile.orig	2016-03-10 19:32:49 UTC
+--- Gemfile.orig	2016-04-04 10:12:21 UTC
 +++ Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
@@ -10,10 +10,10 @@
  # Responders respond_to and respond_with
 @@ -8,19 +8,18 @@ gem 'responders', '~> 2.0'
  
- # Specify a sprockets version due to security issue
- # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
--gem 'sprockets', '~> 2.12.3'
-+gem 'sprockets', '>= 2.12.3'
+ # Specify a sprockets version due to increased performance
+ # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+-gem 'sprockets', '~> 3.3.5'
++gem 'sprockets', '>= 3.3.5'
  
  # Default values for AR models
 -gem "default_value_for", "~> 3.0.0"
@@ -30,17 +30,16 @@
 +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'
- gem 'omniauth-bitbucket',     '~> 0.0.2'
-@@ -28,29 +27,28 @@ gem 'omniauth-cas3',          '~> 1.1.2'
+@@ -29,25 +28,24 @@ gem 'omniauth-cas3',          '~> 1.1.2'
  gem 'omniauth-facebook',      '~> 3.0.0'
  gem 'omniauth-github',        '~> 1.1.1'
  gem 'omniauth-gitlab',        '~> 1.0.0'
 -gem 'omniauth-google-oauth2', '~> 0.2.0'
 -gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
--gem 'omniauth-saml',          '~> 1.4.2'
 +gem 'omniauth-google-oauth2', '>= 0.2.0'
-+gem 'omniauth-saml',          '>= 1.4.2'
+ gem 'omniauth-saml',          '~> 1.5.0'
  gem 'omniauth-shibboleth',    '~> 1.2.0'
  gem 'omniauth-twitter',       '~> 1.2.0'
  gem 'omniauth_crowd',         '~> 2.2.0'
@@ -55,7 +54,8 @@
 -gem 'devise-two-factor', '~> 2.0.0'
 +gem 'devise-two-factor', '>= 2.0.0'
  gem 'rqrcode-rails3', '~> 0.1.7'
- gem 'attr_encrypted', '~> 1.3.4'
+-gem 'attr_encrypted', '~> 1.3.4'
++gem 'attr_encrypted', '>= 1.3.4'
  
  # Browser detection
 -gem "browser", '~> 1.0.0'
@@ -63,21 +63,17 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
--gem "gitlab_git", '~> 8.2'
-+gem "gitlab_git", '~> 10.0'
- 
- # LDAP Auth
- # GitLab fork with several improvements to original library. For full list of changes
-@@ -58,14 +56,14 @@ gem "gitlab_git", '~> 8.2'
- gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
+@@ -60,15 +58,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
  
  # Git Wiki
--gem 'gollum-lib', '~> 4.1.0'
-+gem 'gollum-lib', '>= 4.1.0'
+ # Required manually in config/initializers/gollum.rb to control load order
+-gem 'gollum-lib', '~> 4.1.0', require: false
++gem 'gollum-lib', '>= 4.1.0', require: false
+ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
 -gem "github-linguist", "~> 4.7.0", require: "linguist"
-+gem "github-linguist", "~> 4.8.0", require: "linguist"
++gem "github-linguist", ">= 4.7.0", require: "linguist"
  
  # API
 -gem 'grape',        '~> 0.13.0'
@@ -87,12 +83,12 @@
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
  # Pagination
-@@ -75,13 +73,13 @@ gem "kaminari", "~> 0.16.3"
+@@ -78,13 +76,13 @@ gem "kaminari", "~> 0.16.3"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
--gem "carrierwave", '~> 0.9.0'
-+gem "carrierwave", '>= 0.9.0'
+-gem "carrierwave", '~> 0.10.0'
++gem "carrierwave", '>= 0.10.0'
  
  # Drag and Drop UI
  gem 'dropzonejs-rails', '~> 0.7.1'
@@ -103,7 +99,7 @@
  gem "unf", '~> 0.1.4'
  
  # Authorization
-@@ -93,13 +91,13 @@ gem "seed-fu", '~> 2.3.5'
+@@ -96,13 +94,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'
@@ -120,7 +116,7 @@
  gem 'asciidoctor',   '~> 1.5.2'
  gem 'rouge',         '~> 1.10.1'
  
-@@ -108,11 +106,11 @@ gem 'rouge',         '~> 1.10.1'
+@@ -111,11 +109,11 @@ gem 'rouge',         '~> 1.10.1'
  gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
  
  # Diffs
@@ -129,12 +125,12 @@
  
  # Application server
  group :unicorn do
--  gem "unicorn", '~> 4.8.2'
-+  gem "unicorn", '>= 4.8.2'
+-  gem "unicorn", '~> 4.9.0'
++  gem "unicorn", '>= 4.9.0'
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
-@@ -159,10 +157,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
+@@ -162,10 +160,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
  gem "gemnasium-gitlab-service", "~> 0.2"
  
  # Slack integration
@@ -147,7 +143,7 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
-@@ -177,17 +175,17 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
+@@ -180,17 +178,17 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
  gem "underscore-rails", "~> 1.8.0"
  
  # Sanitize user input
@@ -168,7 +164,7 @@
  
  # Keyboard shortcuts
  gem 'mousetrap-rails', '~> 1.4.6'
-@@ -197,115 +195,36 @@ gem 'charlock_holmes', '~> 0.7.3'
+@@ -200,119 +198,37 @@ gem 'charlock_holmes', '~> 0.7.3'
  
  gem "sass-rails", '~> 5.0.0'
  gem "coffee-rails", '~> 4.1.0'
@@ -188,18 +184,19 @@
 +gem 'jquery-rails',       '>= 4.0.0'
  gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 5.0.0'
- gem 'nprogress-rails',    '~> 0.1.6.7'
  gem 'raphael-rails',      '~> 2.1.2'
 -gem 'request_store',      '~> 1.2.0'
 +gem 'request_store',      '>= 1.2.0'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
-+gem 'net-ssh',            '~> 3.1.0'
++gem 'net-ssh',            '>= 3.0.1'
  
  # Sentry integration
  gem 'sentry-raven', '~> 0.15'
  
+ gem 'premailer-rails', '~> 1.9.0'
+ 
 -# Metrics
 -group :metrics do
 -  gem 'allocations', '~> 1.0', require: false, platform: :mri
@@ -238,10 +235,12 @@
 -  gem 'awesome_print', '~> 1.2.0', require: false
 -  gem 'fuubar', '~> 2.0.0'
 -
--  gem 'database_cleaner', '~> 1.4.0'
--  gem 'factory_girl_rails', '~> 4.3.0'
--  gem 'rspec-rails',      '~> 3.3.0'
--  gem 'spinach-rails', '~> 0.2.1'
+-  gem 'database_cleaner',   '~> 1.4.0'
+-  gem 'factory_girl_rails', '~> 4.6.0'
+-  gem 'rspec-rails',        '~> 3.3.0'
+-  gem 'rspec-retry'
+-  gem 'spinach-rails',      '~> 0.2.1'
+-  gem 'spinach-rerun-reporter', '~> 0.0.2'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.7.0'
@@ -249,19 +248,20 @@
 -  # Generate Fake data
 -  gem 'ffaker', '~> 2.0.0'
 -
--  gem 'capybara',            '~> 2.4.0'
+-  gem 'capybara',            '~> 2.6.2'
 -  gem 'capybara-screenshot', '~> 1.0.0'
--  gem 'poltergeist',         '~> 1.8.1'
+-  gem 'poltergeist',         '~> 1.9.0'
 -
 -  gem 'teaspoon', '~> 1.0.0'
 -  gem 'teaspoon-jasmine', '~> 2.2.0'
 -
--  gem 'spring', '~> 1.3.6'
+-  gem 'spring', '~> 1.6.4'
 -  gem 'spring-commands-rspec',    '~> 1.0.4'
 -  gem 'spring-commands-spinach',  '~> 1.0.0'
 -  gem 'spring-commands-teaspoon', '~> 0.0.2'
 -
 -  gem 'rubocop', '~> 0.35.0', require: false
+-  gem 'scss_lint', '~> 0.47.0', require: false
 -  gem 'coveralls',  '~> 0.8.2', require: false
 -  gem 'simplecov', '~> 0.10.0', require: false
 -  gem 'flog', require: false
@@ -290,7 +290,7 @@
  
  gem "mail_room", "~> 0.6.1"
  
-@@ -317,7 +236,9 @@ gem 'activerecord-session_store', '~> 0.
+@@ -324,7 +240,9 @@ gem 'activerecord-session_store', '~> 0.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth

Modified: head/www/gitlab/files/patch-config_database.yml.postgresql
==============================================================================
--- head/www/gitlab/files/patch-config_database.yml.postgresql	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-config_database.yml.postgresql	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,4 +1,4 @@
---- config/database.yml.postgresql.orig	2016-03-10 19:32:49 UTC
+--- config/database.yml.postgresql.orig	2016-04-04 10:12:21 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 Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2016-03-10 19:32:49 UTC
+--- config/gitlab.yml.example.orig	2016-04-04 10:12:21 UTC
 +++ config/gitlab.yml.example
-@@ -402,11 +402,11 @@ production: &base
+@@ -408,11 +408,11 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -14,7 +14,7 @@
  
      # 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).
-@@ -423,7 +423,7 @@ production: &base
+@@ -429,7 +429,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 Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-config_initializers_1__settings.rb	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2016-03-10 19:32:49 UTC
+--- config/initializers/1_settings.rb.orig	2016-04-04 10:12:21 UTC
 +++ config/initializers/1_settings.rb
-@@ -165,11 +165,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -166,11 +166,7 @@ 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'

Modified: head/www/gitlab/files/patch-config_unicorn.rb.example
==============================================================================
--- head/www/gitlab/files/patch-config_unicorn.rb.example	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-config_unicorn.rb.example	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,4 +1,4 @@
---- config/unicorn.rb.example.orig	2016-03-10 19:32:49 UTC
+--- config/unicorn.rb.example.orig	2016-04-04 10:12:21 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 Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab.orig	2016-03-10 19:32:49 UTC
+--- lib/support/nginx/gitlab.orig	2016-04-04 10:12:21 UTC
 +++ lib/support/nginx/gitlab
 @@ -17,7 +17,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
@@ -9,12 +9,12 @@
  }
  
  ## Normal HTTP host
-@@ -30,7 +30,7 @@ server {
-   listen [::]:80 default_server;
-   server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
-   server_tokens off; ## Don't show the nginx version number, a security best practice
--  root /home/git/gitlab/public;
-+  root /usr/local/www/gitlab/public;
- 
-   ## See app/controllers/application_controller.rb for headers set
+@@ -62,7 +62,7 @@ server {
+   error_page 500 /500.html;
+   error_page 502 /502.html;
+   location ~ ^/(404|422|500|502)\.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	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig	2016-03-10 19:32:49 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2016-04-04 10:12:21 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
-@@ -45,7 +45,7 @@ server {
-   listen [::]:443 ipv6only=on ssl default_server;
-   server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
-   server_tokens off; ## Don't show the nginx version number, a security best practice
--  root /home/git/gitlab/public;
-+  root /usr/local/www/gitlab/public;
- 
-   ## Strong SSL Security
-   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
+@@ -106,7 +106,7 @@ server {
+   error_page 500 /500.html;
+   error_page 502 /502.html;
+   location ~ ^/(404|422|500|502)\.html$ {
+-    root /home/git/gitlab/public;
++    root /usr/local/www/gitlab/public;
+     internal;
+   }
+ }

Modified: head/www/gitlab/pkg-message
==============================================================================
--- head/www/gitlab/pkg-message	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/pkg-message	Wed Apr 13 16:46:42 2016	(r413219)
@@ -3,9 +3,13 @@ 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/8-5-docu/doc/install/installation-freebsd.md
+https://github.com/t-zuehlsdorff/gitlabhq/blob/8-6-docu/doc/install/installation-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/8-5-docu/doc/update/freebsd_patch_versions.md
+https://github.com/t-zuehlsdorff/gitlabhq/blob/8-6-docu/doc/update/freebsd_patch_versions.md
+
+If you just installed an major upgrade of GitLab, for example you
+switched from 8.5.x to 8.6.x, please follow the instructions in the guide at:
+https://github.com/t-zuehlsdorff/gitlabhq/blob/8-6-docu/doc/update/8.5-to-8.6-freebsd.md

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Wed Apr 13 16:44:49 2016	(r413218)
+++ head/www/gitlab/pkg-plist	Wed Apr 13 16:46:42 2016	(r413219)
@@ -1,3 +1,4 @@
+%%WWWDIR%%/.csscomb.json
 %%WWWDIR%%/.flayignore
 %%WWWDIR%%/.foreman
 %%WWWDIR%%/.gitattributes
@@ -8,6 +9,7 @@
 %%WWWDIR%%/.rspec
 %%WWWDIR%%/.rubocop.yml
 %%WWWDIR%%/.ruby-version
+%%WWWDIR%%/.scss-lint.yml
 %%WWWDIR%%/.simplecov
 %%WWWDIR%%/.teatro.yml
 %%WWWDIR%%/CHANGELOG
@@ -111,6 +113,7 @@
 %%WWWDIR%%/app/assets/javascripts/blob/edit_blob.js.coffee
 %%WWWDIR%%/app/assets/javascripts/blob/new_blob.js.coffee
 %%WWWDIR%%/app/assets/javascripts/branch-graph.js.coffee
+%%WWWDIR%%/app/assets/javascripts/breakpoints.coffee
 %%WWWDIR%%/app/assets/javascripts/broadcast_message.js.coffee
 %%WWWDIR%%/app/assets/javascripts/build_artifacts.js.coffee
 %%WWWDIR%%/app/assets/javascripts/calendar.js.coffee
@@ -123,7 +126,6 @@
 %%WWWDIR%%/app/assets/javascripts/commits.js.coffee
 %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js.coffee
 %%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js.coffee
-%%WWWDIR%%/app/assets/javascripts/dashboard.js.coffee
 %%WWWDIR%%/app/assets/javascripts/diff.js.coffee
 %%WWWDIR%%/app/assets/javascripts/dispatcher.js.coffee
 %%WWWDIR%%/app/assets/javascripts/dropzone_input.js.coffee
@@ -131,6 +133,7 @@
 %%WWWDIR%%/app/assets/javascripts/extensions/jquery.js.coffee
 %%WWWDIR%%/app/assets/javascripts/flash.js.coffee
 %%WWWDIR%%/app/assets/javascripts/gfm_auto_complete.js.coffee
+%%WWWDIR%%/app/assets/javascripts/gl_dropdown.js.coffee
 %%WWWDIR%%/app/assets/javascripts/group_avatar.js.coffee
 %%WWWDIR%%/app/assets/javascripts/groups.js.coffee
 %%WWWDIR%%/app/assets/javascripts/groups_select.js.coffee
@@ -138,8 +141,10 @@
 %%WWWDIR%%/app/assets/javascripts/issuable_context.js.coffee
 %%WWWDIR%%/app/assets/javascripts/issuable_form.js.coffee
 %%WWWDIR%%/app/assets/javascripts/issue.js.coffee
+%%WWWDIR%%/app/assets/javascripts/issue_status_select.js.coffee
 %%WWWDIR%%/app/assets/javascripts/issues.js.coffee
 %%WWWDIR%%/app/assets/javascripts/labels.js.coffee
+%%WWWDIR%%/app/assets/javascripts/labels_select.js.coffee
 %%WWWDIR%%/app/assets/javascripts/lib/jquery.timeago.js
 %%WWWDIR%%/app/assets/javascripts/lib/md5.js
 %%WWWDIR%%/app/assets/javascripts/lib/utf8_encode.js
@@ -151,6 +156,7 @@
 %%WWWDIR%%/app/assets/javascripts/merge_request_widget.js.coffee
 %%WWWDIR%%/app/assets/javascripts/merge_requests.js.coffee
 %%WWWDIR%%/app/assets/javascripts/milestone.js.coffee
+%%WWWDIR%%/app/assets/javascripts/milestone_select.js.coffee
 %%WWWDIR%%/app/assets/javascripts/namespace_select.js.coffee
 %%WWWDIR%%/app/assets/javascripts/network.js.coffee
 %%WWWDIR%%/app/assets/javascripts/new_branch_form.js.coffee
@@ -184,8 +190,10 @@
 %%WWWDIR%%/app/assets/javascripts/stat_graph_contributors_util.js.coffee
 %%WWWDIR%%/app/assets/javascripts/subscription.js.coffee
 %%WWWDIR%%/app/assets/javascripts/syntax_highlight.coffee
+%%WWWDIR%%/app/assets/javascripts/todos.js.coffee
 %%WWWDIR%%/app/assets/javascripts/tree.js.coffee
 %%WWWDIR%%/app/assets/javascripts/user.js.coffee
+%%WWWDIR%%/app/assets/javascripts/user_tabs.js.coffee
 %%WWWDIR%%/app/assets/javascripts/users_select.js.coffee
 %%WWWDIR%%/app/assets/javascripts/wikis.js.coffee
 %%WWWDIR%%/app/assets/javascripts/zen_mode.js.coffee
@@ -198,6 +206,7 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/calendar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/callout.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/common.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/dropdowns.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/files.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/filters.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/flash.scss
@@ -217,6 +226,7 @@
 %%WWWDIR%%/app/assets/stylesheets/framework/nav.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/pagination.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/panels.scss
+%%WWWDIR%%/app/assets/stylesheets/framework/progress.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/sidebar.scss
 %%WWWDIR%%/app/assets/stylesheets/framework/tables.scss
@@ -231,6 +241,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/notify.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/appearances.scss
 %%WWWDIR%%/app/assets/stylesheets/pages/awards.scss
@@ -306,18 +317,24 @@
 %%WWWDIR%%/app/controllers/ci/lints_controller.rb
 %%WWWDIR%%/app/controllers/ci/projects_controller.rb
 %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb
+%%WWWDIR%%/app/controllers/concerns/continue_params.rb
 %%WWWDIR%%/app/controllers/concerns/creates_commit.rb
+%%WWWDIR%%/app/controllers/concerns/filter_projects.rb
 %%WWWDIR%%/app/controllers/concerns/global_milestones.rb
+%%WWWDIR%%/app/controllers/concerns/issuable_actions.rb
 %%WWWDIR%%/app/controllers/concerns/issues_action.rb
 %%WWWDIR%%/app/controllers/concerns/merge_requests_action.rb
+%%WWWDIR%%/app/controllers/concerns/toggle_subscription_action.rb
 %%WWWDIR%%/app/controllers/confirmations_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/application_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/groups_controller.rb
+%%WWWDIR%%/app/controllers/dashboard/labels_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/milestones_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/projects_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/snippets_controller.rb
 %%WWWDIR%%/app/controllers/dashboard/todos_controller.rb
 %%WWWDIR%%/app/controllers/dashboard_controller.rb
+%%WWWDIR%%/app/controllers/emojis_controller.rb
 %%WWWDIR%%/app/controllers/explore/application_controller.rb
 %%WWWDIR%%/app/controllers/explore/groups_controller.rb
 %%WWWDIR%%/app/controllers/explore/projects_controller.rb
@@ -367,6 +384,7 @@
 %%WWWDIR%%/app/controllers/projects/find_file_controller.rb
 %%WWWDIR%%/app/controllers/projects/forks_controller.rb
 %%WWWDIR%%/app/controllers/projects/graphs_controller.rb
+%%WWWDIR%%/app/controllers/projects/group_links_controller.rb
 %%WWWDIR%%/app/controllers/projects/hooks_controller.rb
 %%WWWDIR%%/app/controllers/projects/imports_controller.rb
 %%WWWDIR%%/app/controllers/projects/issues_controller.rb
@@ -406,8 +424,11 @@
 %%WWWDIR%%/app/controllers/users_controller.rb
 %%WWWDIR%%/app/finders/README.md
 %%WWWDIR%%/app/finders/contributed_projects_finder.rb
+%%WWWDIR%%/app/finders/group_projects_finder.rb
+%%WWWDIR%%/app/finders/groups_finder.rb
 %%WWWDIR%%/app/finders/issuable_finder.rb
 %%WWWDIR%%/app/finders/issues_finder.rb
+%%WWWDIR%%/app/finders/joined_groups_finder.rb
 %%WWWDIR%%/app/finders/merge_requests_finder.rb
 %%WWWDIR%%/app/finders/milestones_finder.rb
 %%WWWDIR%%/app/finders/notes_finder.rb
@@ -416,6 +437,7 @@
 %%WWWDIR%%/app/finders/snippets_finder.rb
 %%WWWDIR%%/app/finders/todos_finder.rb
 %%WWWDIR%%/app/finders/trending_projects_finder.rb
+%%WWWDIR%%/app/finders/union_finder.rb
 %%WWWDIR%%/app/helpers/appearances_helper.rb
 %%WWWDIR%%/app/helpers/application_helper.rb
 %%WWWDIR%%/app/helpers/application_settings_helper.rb
@@ -430,6 +452,7 @@
 %%WWWDIR%%/app/helpers/compare_helper.rb
 %%WWWDIR%%/app/helpers/dashboard_helper.rb
 %%WWWDIR%%/app/helpers/diff_helper.rb
+%%WWWDIR%%/app/helpers/dropdowns_helper.rb
 %%WWWDIR%%/app/helpers/emails_helper.rb
 %%WWWDIR%%/app/helpers/events_helper.rb
 %%WWWDIR%%/app/helpers/explore_helper.rb
@@ -483,6 +506,7 @@
 %%WWWDIR%%/app/models/appearance.rb
 %%WWWDIR%%/app/models/application_setting.rb
 %%WWWDIR%%/app/models/audit_event.rb
+%%WWWDIR%%/app/models/blob.rb
 %%WWWDIR%%/app/models/broadcast_message.rb
 %%WWWDIR%%/app/models/ci/build.rb
 %%WWWDIR%%/app/models/ci/commit.rb
@@ -498,16 +522,17 @@
 %%WWWDIR%%/app/models/concerns/internal_id.rb
 %%WWWDIR%%/app/models/concerns/issuable.rb
 %%WWWDIR%%/app/models/concerns/mentionable.rb
+%%WWWDIR%%/app/models/concerns/milestoneish.rb
 %%WWWDIR%%/app/models/concerns/notifiable.rb
 %%WWWDIR%%/app/models/concerns/participable.rb
 %%WWWDIR%%/app/models/concerns/referable.rb
 %%WWWDIR%%/app/models/concerns/sortable.rb
 %%WWWDIR%%/app/models/concerns/strip_attribute.rb
+%%WWWDIR%%/app/models/concerns/subscribable.rb
 %%WWWDIR%%/app/models/concerns/taskable.rb
 %%WWWDIR%%/app/models/concerns/token_authenticatable.rb
 %%WWWDIR%%/app/models/deploy_key.rb
 %%WWWDIR%%/app/models/deploy_keys_project.rb
-%%WWWDIR%%/app/models/diff_line.rb
 %%WWWDIR%%/app/models/email.rb
 %%WWWDIR%%/app/models/event.rb
 %%WWWDIR%%/app/models/external_issue.rb
@@ -541,6 +566,7 @@
 %%WWWDIR%%/app/models/notification.rb
 %%WWWDIR%%/app/models/personal_snippet.rb
 %%WWWDIR%%/app/models/project.rb
+%%WWWDIR%%/app/models/project_group_link.rb
 %%WWWDIR%%/app/models/project_import_data.rb
 %%WWWDIR%%/app/models/project_services/asana_service.rb
 %%WWWDIR%%/app/models/project_services/assembla_service.rb
@@ -590,7 +616,6 @@
 %%WWWDIR%%/app/models/user.rb
 %%WWWDIR%%/app/models/users_star_project.rb
 %%WWWDIR%%/app/models/wiki_page.rb
-%%WWWDIR%%/app/services/archive_repository_service.rb
 %%WWWDIR%%/app/services/audit_event_service.rb
 %%WWWDIR%%/app/services/base_service.rb
 %%WWWDIR%%/app/services/ci/create_builds_service.rb
@@ -620,11 +645,15 @@
 %%WWWDIR%%/app/services/git_push_service.rb
 %%WWWDIR%%/app/services/git_tag_push_service.rb
 %%WWWDIR%%/app/services/gravatar_service.rb
+%%WWWDIR%%/app/services/groups/base_service.rb
+%%WWWDIR%%/app/services/groups/create_service.rb
+%%WWWDIR%%/app/services/groups/update_service.rb
 %%WWWDIR%%/app/services/issuable_base_service.rb
 %%WWWDIR%%/app/services/issues/base_service.rb
 %%WWWDIR%%/app/services/issues/bulk_update_service.rb
 %%WWWDIR%%/app/services/issues/close_service.rb
 %%WWWDIR%%/app/services/issues/create_service.rb
+%%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/base_service.rb
@@ -748,11 +777,9 @@
 %%WWWDIR%%/app/views/admin/users/new.html.haml
 %%WWWDIR%%/app/views/admin/users/projects.html.haml
 %%WWWDIR%%/app/views/admin/users/show.html.haml
-%%WWWDIR%%/app/views/ci/commits/_commit.html.haml
 %%WWWDIR%%/app/views/ci/errors/show.haml
 %%WWWDIR%%/app/views/ci/lints/_create.html.haml
 %%WWWDIR%%/app/views/ci/lints/show.html.haml
-%%WWWDIR%%/app/views/ci/projects/index.html.haml
 %%WWWDIR%%/app/views/ci/shared/_guide.html.haml
 %%WWWDIR%%/app/views/ci/shared/_no_runners.html.haml
 %%WWWDIR%%/app/views/dashboard/_activities.html.haml
@@ -766,10 +793,6 @@
 %%WWWDIR%%/app/views/dashboard/issues.atom.builder
 %%WWWDIR%%/app/views/dashboard/issues.html.haml
 %%WWWDIR%%/app/views/dashboard/merge_requests.html.haml
-%%WWWDIR%%/app/views/dashboard/milestones/_issue.html.haml
-%%WWWDIR%%/app/views/dashboard/milestones/_issues.html.haml
-%%WWWDIR%%/app/views/dashboard/milestones/_merge_request.html.haml
-%%WWWDIR%%/app/views/dashboard/milestones/_merge_requests.html.haml
 %%WWWDIR%%/app/views/dashboard/milestones/_milestone.html.haml
 %%WWWDIR%%/app/views/dashboard/milestones/index.html.haml
 %%WWWDIR%%/app/views/dashboard/milestones/show.html.haml
@@ -813,6 +836,7 @@
 %%WWWDIR%%/app/views/doorkeeper/authorized_applications/index.html.haml
 %%WWWDIR%%/app/views/email_rejection_mailer/rejection.html.haml
 %%WWWDIR%%/app/views/email_rejection_mailer/rejection.text.haml
+%%WWWDIR%%/app/views/emojis/index.html.haml
 %%WWWDIR%%/app/views/errors/access_denied.html.haml
 %%WWWDIR%%/app/views/errors/encoding.html.haml
 %%WWWDIR%%/app/views/errors/git_not_found.html.haml
@@ -832,7 +856,6 @@
 %%WWWDIR%%/app/views/events/event/_push.html.haml
 %%WWWDIR%%/app/views/explore/_head.html.haml
 %%WWWDIR%%/app/views/explore/groups/index.html.haml
-%%WWWDIR%%/app/views/explore/projects/_dropdown.html.haml
 %%WWWDIR%%/app/views/explore/projects/_filter.html.haml
 %%WWWDIR%%/app/views/explore/projects/_nav.html.haml
 %%WWWDIR%%/app/views/explore/projects/_projects.html.haml
@@ -840,7 +863,10 @@
 %%WWWDIR%%/app/views/explore/projects/starred.html.haml
 %%WWWDIR%%/app/views/explore/projects/trending.html.haml
 %%WWWDIR%%/app/views/explore/snippets/index.html.haml
+%%WWWDIR%%/app/views/groups/_activities.html.haml
 %%WWWDIR%%/app/views/groups/_projects.html.haml
+%%WWWDIR%%/app/views/groups/_shared_projects.html.haml
+%%WWWDIR%%/app/views/groups/activity.html.haml
 %%WWWDIR%%/app/views/groups/edit.html.haml
 %%WWWDIR%%/app/views/groups/group_members/_group_member.html.haml
 %%WWWDIR%%/app/views/groups/group_members/_new_group_member.html.haml
@@ -850,10 +876,6 @@
 %%WWWDIR%%/app/views/groups/issues.html.haml
 %%WWWDIR%%/app/views/groups/merge_requests.html.haml
 %%WWWDIR%%/app/views/groups/milestones/_header_title.html.haml
-%%WWWDIR%%/app/views/groups/milestones/_issue.html.haml
-%%WWWDIR%%/app/views/groups/milestones/_issues.html.haml
-%%WWWDIR%%/app/views/groups/milestones/_merge_request.html.haml
-%%WWWDIR%%/app/views/groups/milestones/_merge_requests.html.haml
 %%WWWDIR%%/app/views/groups/milestones/_milestone.html.haml
 %%WWWDIR%%/app/views/groups/milestones/index.html.haml
 %%WWWDIR%%/app/views/groups/milestones/new.html.haml
@@ -911,7 +933,6 @@
 %%WWWDIR%%/app/views/layouts/group_settings.html.haml
 %%WWWDIR%%/app/views/layouts/header/_default.html.haml
 %%WWWDIR%%/app/views/layouts/header/_empty.html.haml
-%%WWWDIR%%/app/views/layouts/header/_public.html.haml
 %%WWWDIR%%/app/views/layouts/help.html.haml
 %%WWWDIR%%/app/views/layouts/nav/_admin.html.haml
 %%WWWDIR%%/app/views/layouts/nav/_dashboard.html.haml
@@ -930,6 +951,8 @@
 %%WWWDIR%%/app/views/notify/_note_message.html.haml
 %%WWWDIR%%/app/views/notify/_reassigned_issuable_email.html.haml
 %%WWWDIR%%/app/views/notify/_reassigned_issuable_email.text.erb
+%%WWWDIR%%/app/views/notify/_relabeled_issuable_email.html.haml
+%%WWWDIR%%/app/views/notify/_relabeled_issuable_email.text.erb
 %%WWWDIR%%/app/views/notify/build_fail_email.html.haml
 %%WWWDIR%%/app/views/notify/build_fail_email.text.erb
 %%WWWDIR%%/app/views/notify/build_success_email.html.haml
@@ -946,6 +969,8 @@
 %%WWWDIR%%/app/views/notify/group_invite_declined_email.text.erb
 %%WWWDIR%%/app/views/notify/group_member_invited_email.html.haml
 %%WWWDIR%%/app/views/notify/group_member_invited_email.text.erb
+%%WWWDIR%%/app/views/notify/issue_moved_email.html.haml
+%%WWWDIR%%/app/views/notify/issue_moved_email.text.erb
 %%WWWDIR%%/app/views/notify/issue_status_changed_email.html.haml
 %%WWWDIR%%/app/views/notify/issue_status_changed_email.text.erb
 %%WWWDIR%%/app/views/notify/merge_request_status_email.html.haml
@@ -982,11 +1007,14 @@
 %%WWWDIR%%/app/views/notify/reassigned_issue_email.text.erb
 %%WWWDIR%%/app/views/notify/reassigned_merge_request_email.html.haml
 %%WWWDIR%%/app/views/notify/reassigned_merge_request_email.text.erb
+%%WWWDIR%%/app/views/notify/relabeled_issue_email.html.haml
+%%WWWDIR%%/app/views/notify/relabeled_issue_email.text.erb
+%%WWWDIR%%/app/views/notify/relabeled_merge_request_email.html.haml
+%%WWWDIR%%/app/views/notify/relabeled_merge_request_email.text.erb
 %%WWWDIR%%/app/views/notify/repository_push_email.html.haml
 %%WWWDIR%%/app/views/notify/repository_push_email.text.haml
 %%WWWDIR%%/app/views/profiles/_event_table.html.haml
 %%WWWDIR%%/app/views/profiles/accounts/show.html.haml
-%%WWWDIR%%/app/views/profiles/applications.html.haml
 %%WWWDIR%%/app/views/profiles/audit_log.html.haml
 %%WWWDIR%%/app/views/profiles/emails/index.html.haml
 %%WWWDIR%%/app/views/profiles/keys/_form.html.haml
@@ -994,7 +1022,6 @@
 %%WWWDIR%%/app/views/profiles/keys/_key_details.html.haml
 %%WWWDIR%%/app/views/profiles/keys/_key_table.html.haml
 %%WWWDIR%%/app/views/profiles/keys/index.html.haml
-%%WWWDIR%%/app/views/profiles/keys/new.html.haml
 %%WWWDIR%%/app/views/profiles/keys/show.html.haml
 %%WWWDIR%%/app/views/profiles/notifications/_settings.html.haml
 %%WWWDIR%%/app/views/profiles/notifications/show.html.haml
@@ -1011,6 +1038,7 @@
 %%WWWDIR%%/app/views/profiles/update_username.js.haml
 %%WWWDIR%%/app/views/projects/_activity.html.haml
 %%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml
+%%WWWDIR%%/app/views/projects/_builds_settings.html.haml
 %%WWWDIR%%/app/views/projects/_commit_button.html.haml
 %%WWWDIR%%/app/views/projects/_errors.html.haml
 %%WWWDIR%%/app/views/projects/_files.html.haml
@@ -1056,6 +1084,7 @@
 %%WWWDIR%%/app/views/projects/buttons/_fork.html.haml
 %%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/commit/_builds.html.haml
 %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml
 %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml
@@ -1063,7 +1092,6 @@
 %%WWWDIR%%/app/views/projects/commit/branches.html.haml
 %%WWWDIR%%/app/views/projects/commit/builds.html.haml
 %%WWWDIR%%/app/views/projects/commit/show.html.haml
-%%WWWDIR%%/app/views/projects/commit_statuses/_commit_status.html.haml
 %%WWWDIR%%/app/views/projects/commits/_commit.html.haml
 %%WWWDIR%%/app/views/projects/commits/_commit_list.html.haml
 %%WWWDIR%%/app/views/projects/commits/_commits.html.haml
@@ -1082,6 +1110,7 @@
 %%WWWDIR%%/app/views/projects/diffs/_diffs.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_file.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_image.html.haml
+%%WWWDIR%%/app/views/projects/diffs/_line.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_match_line.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_match_line_parallel.html.haml
 %%WWWDIR%%/app/views/projects/diffs/_parallel_view.html.haml
@@ -1091,10 +1120,11 @@
 %%WWWDIR%%/app/views/projects/edit.html.haml
 %%WWWDIR%%/app/views/projects/empty.html.haml
 %%WWWDIR%%/app/views/projects/find_file/show.html.haml
+%%WWWDIR%%/app/views/projects/forks/_projects.html.haml
 %%WWWDIR%%/app/views/projects/forks/error.html.haml
 %%WWWDIR%%/app/views/projects/forks/index.html.haml
 %%WWWDIR%%/app/views/projects/forks/new.html.haml
-%%WWWDIR%%/app/views/projects/go_import.html.haml
+%%WWWDIR%%/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
 %%WWWDIR%%/app/views/projects/graphs/_head.html.haml
 %%WWWDIR%%/app/views/projects/graphs/_header_title.html.haml
 %%WWWDIR%%/app/views/projects/graphs/ci.html.haml
@@ -1104,6 +1134,7 @@
 %%WWWDIR%%/app/views/projects/graphs/commits.html.haml
 %%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/index.html.haml
 %%WWWDIR%%/app/views/projects/imports/new.html.haml
 %%WWWDIR%%/app/views/projects/imports/show.html.haml
@@ -1114,6 +1145,8 @@
 %%WWWDIR%%/app/views/projects/issues/_issue.html.haml
 %%WWWDIR%%/app/views/projects/issues/_issues.html.haml
 %%WWWDIR%%/app/views/projects/issues/_merge_requests.html.haml
+%%WWWDIR%%/app/views/projects/issues/_new_branch.html.haml
+%%WWWDIR%%/app/views/projects/issues/_related_branches.html.haml
 %%WWWDIR%%/app/views/projects/issues/edit.html.haml
 %%WWWDIR%%/app/views/projects/issues/index.atom.builder
 %%WWWDIR%%/app/views/projects/issues/index.html.haml
@@ -1173,10 +1206,6 @@
 %%WWWDIR%%/app/views/projects/merge_requests/widget/open/_wip.html.haml
 %%WWWDIR%%/app/views/projects/milestones/_form.html.haml
 %%WWWDIR%%/app/views/projects/milestones/_header_title.html.haml
-%%WWWDIR%%/app/views/projects/milestones/_issue.html.haml
-%%WWWDIR%%/app/views/projects/milestones/_issues.html.haml
-%%WWWDIR%%/app/views/projects/milestones/_merge_request.html.haml
-%%WWWDIR%%/app/views/projects/milestones/_merge_requests.html.haml
 %%WWWDIR%%/app/views/projects/milestones/_milestone.html.haml
 %%WWWDIR%%/app/views/projects/milestones/edit.html.haml
 %%WWWDIR%%/app/views/projects/milestones/index.html.haml
@@ -1207,6 +1236,7 @@
 %%WWWDIR%%/app/views/projects/project_members/_header_title.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_project_member.html.haml
+%%WWWDIR%%/app/views/projects/project_members/_shared_group_members.html.haml
 %%WWWDIR%%/app/views/projects/project_members/_team.html.haml
 %%WWWDIR%%/app/views/projects/project_members/import.html.haml
 %%WWWDIR%%/app/views/projects/project_members/index.html.haml
@@ -1311,12 +1341,26 @@
 %%WWWDIR%%/app/views/shared/_visibility_level.html.haml
 %%WWWDIR%%/app/views/shared/_visibility_radios.html.haml
 %%WWWDIR%%/app/views/shared/groups/_group.html.haml
+%%WWWDIR%%/app/views/shared/groups/_list.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_filter.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_form.html.haml
+%%WWWDIR%%/app/views/shared/issuable/_label_dropdown.html.haml
+%%WWWDIR%%/app/views/shared/issuable/_milestone_dropdown.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_nav.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_participants.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_search_form.html.haml
 %%WWWDIR%%/app/views/shared/issuable/_sidebar.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_issuable.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_issuables.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_issues_tab.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_labels_tab.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_merge_requests_tab.haml
+%%WWWDIR%%/app/views/shared/milestones/_milestone.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_participants_tab.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_summary.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_tabs.html.haml
+%%WWWDIR%%/app/views/shared/milestones/_top.html.haml
+%%WWWDIR%%/app/views/shared/projects/_dropdown.html.haml
 %%WWWDIR%%/app/views/shared/projects/_list.html.haml
 %%WWWDIR%%/app/views/shared/projects/_project.html.haml
 %%WWWDIR%%/app/views/shared/snippets/_blob.html.haml
@@ -1345,8 +1389,10 @@
 %%WWWDIR%%/app/views/users/show.html.haml
 %%WWWDIR%%/app/views/votes/_votes_block.html.haml
 %%WWWDIR%%/app/workers/build_email_worker.rb
+%%WWWDIR%%/app/workers/delete_user_worker.rb
 %%WWWDIR%%/app/workers/email_receiver_worker.rb
 %%WWWDIR%%/app/workers/emails_on_push_worker.rb
+%%WWWDIR%%/app/workers/gitlab_shell_one_shot_worker.rb
 %%WWWDIR%%/app/workers/gitlab_shell_worker.rb
 %%WWWDIR%%/app/workers/irker_worker.rb
 %%WWWDIR%%/app/workers/merge_worker.rb
@@ -1408,14 +1454,19 @@
 %%WWWDIR%%/config/initializers/disable_email_interceptor.rb
 %%WWWDIR%%/config/initializers/doorkeeper.rb
 %%WWWDIR%%/config/initializers/gitlab_shell_secret_token.rb
+%%WWWDIR%%/config/initializers/go_get.rb
+%%WWWDIR%%/config/initializers/gollum.rb
 %%WWWDIR%%/config/initializers/haml.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
+%%WWWDIR%%/config/initializers/postgresql_opclasses_support.rb
+%%WWWDIR%%/config/initializers/premailer.rb
 %%WWWDIR%%/config/initializers/public_key.rb
 %%WWWDIR%%/config/initializers/rack_attack_git_basic_auth.rb
 %%WWWDIR%%/config/initializers/rack_lineprof.rb
@@ -1504,10 +1555,12 @@
 %%WWWDIR%%/db/migrate/20130621195223_add_notification_level_to_user_group.rb
 %%WWWDIR%%/db/migrate/20130622115340_add_more_db_index.rb
 %%WWWDIR%%/db/migrate/20130624162710_add_fingerprint_to_key.rb
+%%WWWDIR%%/db/migrate/20130711063759_create_project_group_links.rb
 %%WWWDIR%%/db/migrate/20130804151314_add_st_diff_to_note.rb
 %%WWWDIR%%/db/migrate/20130809124851_add_permission_check_to_user.rb
 %%WWWDIR%%/db/migrate/20130812143708_add_import_url_to_project.rb
 %%WWWDIR%%/db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb
+%%WWWDIR%%/db/migrate/20130820102832_add_access_to_project_group_link.rb
 %%WWWDIR%%/db/migrate/20130821090530_remove_deprecated_tables.rb
 %%WWWDIR%%/db/migrate/20130821090531_add_internal_ids_to_milestones.rb
 %%WWWDIR%%/db/migrate/20130909132950_add_description_to_merge_request.rb
@@ -1641,6 +1694,7 @@
 %%WWWDIR%%/db/migrate/20150924125436_migrate_project_id_for_ci_commits.rb
 %%WWWDIR%%/db/migrate/20150930001110_merge_request_error_field.rb
 %%WWWDIR%%/db/migrate/20150930095736_add_null_to_name_for_ci_projects.rb
+%%WWWDIR%%/db/migrate/20150930110012_add_group_share_lock.rb
 %%WWWDIR%%/db/migrate/20151002112914_add_stage_idx_to_builds.rb
 %%WWWDIR%%/db/migrate/20151002121400_add_index_for_builds.rb
 %%WWWDIR%%/db/migrate/20151002122929_add_ref_and_tag_to_builds.rb
@@ -1724,13 +1778,32 @@
 %%WWWDIR%%/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb
 %%WWWDIR%%/db/migrate/20160202091601_add_erasable_to_ci_build.rb
 %%WWWDIR%%/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
+%%WWWDIR%%/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
 %%WWWDIR%%/db/migrate/20160209130428_add_index_to_snippet.rb
 %%WWWDIR%%/db/migrate/20160212123307_create_tasks.rb
 %%WWWDIR%%/db/migrate/20160217100506_add_description_to_label.rb
 %%WWWDIR%%/db/migrate/20160217174422_add_note_to_tasks.rb
 %%WWWDIR%%/db/migrate/20160220123949_rename_tasks_to_todos.rb
 %%WWWDIR%%/db/migrate/20160222153918_create_appearances_ce.rb
+%%WWWDIR%%/db/migrate/20160223192159_add_confidential_to_issues.rb
+%%WWWDIR%%/db/migrate/20160225090018_add_delete_at_to_issues.rb
+%%WWWDIR%%/db/migrate/20160225101956_add_delete_at_to_merge_requests.rb
+%%WWWDIR%%/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
+%%WWWDIR%%/db/migrate/20160229193553_add_main_language_to_repository.rb
+%%WWWDIR%%/db/migrate/20160301124843_add_visibility_level_to_groups.rb
+%%WWWDIR%%/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
+%%WWWDIR%%/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
+%%WWWDIR%%/db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
 %%WWWDIR%%/db/migrate/20160309140734_fix_todos.rb
+%%WWWDIR%%/db/migrate/20160310185910_add_external_flag_to_users.rb
+%%WWWDIR%%/db/migrate/20160314143402_projects_add_pushes_since_gc.rb
+%%WWWDIR%%/db/migrate/20160316123110_ci_runners_token_index.rb
+%%WWWDIR%%/db/migrate/20160316192622_change_target_id_to_null_on_todos.rb
+%%WWWDIR%%/db/migrate/20160316204731_add_commit_id_to_todos.rb
+%%WWWDIR%%/db/migrate/20160317092222_add_moved_to_to_issue.rb
+%%WWWDIR%%/db/migrate/20160320204112_index_namespaces_on_visibility_level.rb
+%%WWWDIR%%/db/migrate/20160324020319_remove_todos_for_deleted_issues.rb
+%%WWWDIR%%/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb
 %%WWWDIR%%/db/migrate/limits_to_mysql.rb
 %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb
@@ -1770,8 +1843,6 @@
 %%WWWDIR%%/doc/ci/README.md
 %%WWWDIR%%/doc/ci/api/README.md
 %%WWWDIR%%/doc/ci/api/builds.md
-%%WWWDIR%%/doc/ci/api/commits.md
-%%WWWDIR%%/doc/ci/api/projects.md
 %%WWWDIR%%/doc/ci/api/runners.md
 %%WWWDIR%%/doc/ci/build_artifacts/README.md
 %%WWWDIR%%/doc/ci/build_artifacts/img/build_artifacts_browser.png
@@ -1782,13 +1853,12 @@
 %%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/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
 %%WWWDIR%%/doc/ci/examples/test-clojure-application.md
 %%WWWDIR%%/doc/ci/img/builds_tab.png
 %%WWWDIR%%/doc/ci/img/features_settings.png
-%%WWWDIR%%/doc/ci/languages/README.md
-%%WWWDIR%%/doc/ci/languages/php.md
 %%WWWDIR%%/doc/ci/permissions/README.md
 %%WWWDIR%%/doc/ci/quick_start/README.md
 %%WWWDIR%%/doc/ci/quick_start/img/build_log.png
@@ -1823,19 +1893,21 @@
 %%WWWDIR%%/doc/customization/welcome_message.md
 %%WWWDIR%%/doc/development/README.md
 %%WWWDIR%%/doc/development/architecture.md
-%%WWWDIR%%/doc/development/benchmarking.md
 %%WWWDIR%%/doc/development/ci_setup.md
 %%WWWDIR%%/doc/development/db_dump.md
 %%WWWDIR%%/doc/development/doc_styleguide.md
 %%WWWDIR%%/doc/development/gitlab_diagram_overview.odg

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

More information about the svn-ports-all mailing list