www/gitlab: 8.6.6 -> 8.7.0

Changes:
  https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG

PR:		209138
Submitted by:	Torsten Zuehlsdorff <ports@toco-domains.de> (maintainer)

8 files changed, 31 insertions, 37 deletions

diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index 01da466575a5..3c1f5dc7f67b 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -2,6 +2,8 @@
 
 # $FreeBSD$
 
+# $FreeBSD$
+
 ### BEGIN INIT INFO
 # Provides:          gitlab
 # Required-Start:    $local_fs $remote_fs $network $syslog redis-server
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 973be2fd49e5..13828112580e 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,10 +1,10 @@
---- Gemfile.orig	2016-04-04 10:12:21 UTC
+--- Gemfile.orig	2016-04-27 09:47:33 UTC
 +++ Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
  
--gem 'rails', '4.2.5.2'
-+gem 'rails', '>= 4.2.5.2'
+-gem 'rails', '4.2.6'
++gem 'rails', '>= 4.2.6'
  gem 'rails-deprecated_sanitizer', '~> 1.0.3'
  
  # Responders respond_to and respond_with
@@ -12,8 +12,8 @@
  
  # 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'
+-gem 'sprockets', '~> 3.6.0'
++gem 'sprockets', '>= 3.6.0'
  
  # Default values for AR models
 -gem "default_value_for", "~> 3.0.0"
@@ -130,7 +130,7 @@
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
-@@ -162,10 +160,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
+@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
  gem "gemnasium-gitlab-service", "~> 0.2"
  
  # Slack integration
@@ -143,7 +143,7 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
-@@ -180,17 +178,17 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
+@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
  gem "underscore-rails", "~> 1.8.0"
  
  # Sanitize user input
@@ -152,7 +152,8 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
- gem "loofah", "~> 2.0.3"
+@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3"
+ gem 'licensee', '~> 8.0.0'
  
  # Protect against bruteforcing
 -gem "rack-attack", '~> 4.3.1'
@@ -164,7 +165,7 @@
  
  # Keyboard shortcuts
  gem 'mousetrap-rails', '~> 1.4.6'
-@@ -200,119 +198,37 @@ gem 'charlock_holmes', '~> 0.7.3'
+@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3'
  
  gem "sass-rails", '~> 5.0.0'
  gem "coffee-rails", '~> 4.1.0'
@@ -185,8 +186,8 @@
  gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 5.0.0'
  gem 'raphael-rails',      '~> 2.1.2'
--gem 'request_store',      '~> 1.2.0'
-+gem 'request_store',      '>= 1.2.0'
+-gem 'request_store',      '~> 1.3.0'
++gem 'request_store',      '>= 1.3.0'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
@@ -202,14 +203,13 @@
 -  gem 'allocations', '~> 1.0', require: false, platform: :mri
 -  gem 'method_source', '~> 0.8', require: false
 -  gem 'influxdb', '~> 0.2', require: false
--  gem 'connection_pool', '~> 2.0', require: false
 -end
 -
 -group :development do
 -  gem "foreman"
--  gem 'brakeman', '~> 3.1.0', require: false
+-  gem 'brakeman', '~> 3.2.0', require: false
 -
--  gem "annotate", "~> 2.6.0"
+-  gem "annotate", "~> 2.7.0"
 -  gem "letter_opener", '~> 1.1.2'
 -  gem 'quiet_assets', '~> 1.0.2'
 -  gem 'rerun', '~> 0.11.0'
@@ -252,18 +252,18 @@
 -  gem 'capybara-screenshot', '~> 1.0.0'
 -  gem 'poltergeist',         '~> 1.9.0'
 -
--  gem 'teaspoon', '~> 1.0.0'
+-  gem 'teaspoon', '~> 1.1.0'
 -  gem 'teaspoon-jasmine', '~> 2.2.0'
 -
--  gem 'spring', '~> 1.6.4'
+-  gem 'spring',                   '~> 1.7.0'
 -  gem 'spring-commands-rspec',    '~> 1.0.4'
--  gem 'spring-commands-spinach',  '~> 1.0.0'
+-  gem 'spring-commands-spinach',  '~> 1.1.0'
 -  gem 'spring-commands-teaspoon', '~> 0.0.2'
 -
--  gem 'rubocop', '~> 0.35.0', require: false
+-  gem 'rubocop', '~> 0.38.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 'simplecov', '~> 0.11.0', require: false
 -  gem 'flog', require: false
 -  gem 'flay', require: false
 -  gem 'bundler-audit', require: false
@@ -282,15 +282,7 @@
  group :production do
    gem "gitlab_meta", '7.0'
  end
- 
- gem "newrelic_rpm", '~> 3.14'
- 
--gem 'octokit', '~> 3.8.0'
-+gem 'octokit', '>= 3.8.0'
- 
- gem "mail_room", "~> 0.6.1"
- 
-@@ -324,7 +240,9 @@ gem 'activerecord-session_store', '~> 0.
+@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth
diff --git a/www/gitlab/files/patch-config_database.yml.postgresql b/www/gitlab/files/patch-config_database.yml.postgresql
index a97abe1fd573..3b87520115b9 100644
--- a/www/gitlab/files/patch-config_database.yml.postgresql
+++ b/www/gitlab/files/patch-config_database.yml.postgresql
@@ -1,4 +1,4 @@
---- config/database.yml.postgresql.orig	2016-04-04 10:12:21 UTC
+--- config/database.yml.postgresql.orig	2016-04-22 10:01:37 UTC
 +++ config/database.yml.postgresql
 @@ -6,7 +6,7 @@ production:
    encoding: unicode
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 14b209403700..532cd364a1e9 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2016-04-04 10:12:21 UTC
+--- config/gitlab.yml.example.orig	2016-04-22 10:01:37 UTC
 +++ config/gitlab.yml.example
-@@ -408,11 +408,11 @@ production: &base
+@@ -437,11 +437,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).
-@@ -429,7 +429,7 @@ production: &base
+@@ -458,7 +458,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
index 80f6c8f9e549..c8472f45d3e6 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2016-04-04 10:12:21 UTC
+--- config/initializers/1_settings.rb.orig	2016-04-22 10:01:37 UTC
 +++ config/initializers/1_settings.rb
-@@ -166,11 +166,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -167,11 +167,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'
diff --git a/www/gitlab/files/patch-config_unicorn.rb.example b/www/gitlab/files/patch-config_unicorn.rb.example
index 7ef1ad5c01bd..a4a64779c56d 100644
--- a/www/gitlab/files/patch-config_unicorn.rb.example
+++ b/www/gitlab/files/patch-config_unicorn.rb.example
@@ -1,4 +1,4 @@
---- config/unicorn.rb.example.orig	2016-04-04 10:12:21 UTC
+--- config/unicorn.rb.example.orig	2016-04-22 10:01:37 UTC
 +++ config/unicorn.rb.example
 @@ -33,12 +33,12 @@ worker_processes 3
  
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab
index 94722ac24f2b..57360ce8ec8c 100644
--- a/www/gitlab/files/patch-lib_support_nginx_gitlab
+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab.orig	2016-04-04 10:12:21 UTC
+--- lib/support/nginx/gitlab.orig	2016-04-22 10:01:37 UTC
 +++ lib/support/nginx/gitlab
 @@ -17,7 +17,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
index ae65fcc39fe1..78f42d7dab39 100644
--- a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig	2016-04-04 10:12:21 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2016-04-22 10:01:37 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -21,7 +21,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.