Update gitlab to version 10.6.4.

For detailed new feature with the major version please check https://about.gitlab.com/2018/03/22/gitlab-10-6-released/

Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15038

1 files changed, 15 insertions, 11 deletions

diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index c1a5560781ed..e684aafe1761 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2018-04-03 16:35:11 UTC
+--- Gemfile.orig	2018-04-09 20:57:26 UTC
 +++ Gemfile
 @@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', '~> 3.0.0'
@@ -18,7 +18,7 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -148,7 +148,7 @@ group :unicorn do
+@@ -149,7 +149,7 @@ group :unicorn do
  end
  
  # State machine
@@ -27,7 +27,7 @@
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -163,7 +163,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
+@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -36,7 +36,7 @@
  
  # Colored output to console
  gem 'rainbow', '~> 2.2'
-@@ -213,11 +213,11 @@ gem 'kubeclient', '~> 2.2.0'
+@@ -214,7 +214,7 @@ gem 'kubeclient', '~> 2.2.0'
  gem 'd3_rails', '~> 3.5.0'
  
  # Sanitize user input
@@ -45,12 +45,16 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
--gem 'loofah', '~> 2.0.3'
-+gem 'loofah', '>= 2.0.3'
+@@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1'
+ gem 'base32', '~> 0.3.0'
  
- # Working with license
- gem 'licensee', '~> 8.7.0'
-@@ -280,7 +280,7 @@ gem 'batch-loader', '~> 1.2.1'
+ # Sentry integration
+-gem 'sentry-raven', '~> 2.5.3'
++gem 'sentry-raven', '>= 2.5.3'
+ 
+ gem 'premailer-rails', '~> 1.9.7'
+ 
+@@ -281,7 +281,7 @@ gem 'batch-loader', '~> 1.2.1'
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
  gem 'peek-host', '~> 1.0.0'
@@ -59,7 +63,7 @@
  gem 'peek-performance_bar', '~> 1.3.0'
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
-@@ -289,97 +289,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+@@ -290,97 +290,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -157,7 +161,7 @@
  gem 'octokit', '~> 4.6.2'
  
  gem 'mail_room', '~> 0.9.1'
-@@ -427,3 +341,6 @@ gem 'grape_logging', '~> 1.7'
+@@ -431,3 +345,6 @@ gem 'grape_logging', '~> 1.7'
  
  # Asset synchronization
  gem 'asset_sync', '~> 2.2.0'