Update www/gitlab to 10.8.4.

Incremental rollouts, plus open source push mirroring
See here for all details: https://about.gitlab.com/2018/05/22/gitlab-10-8-released/

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

4 files changed, 37 insertions, 20 deletions

diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 3c99e67715d8..e2dba50624b8 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2018-05-28 11:47:11 UTC
+--- Gemfile.orig	2018-06-20 17:48:20 UTC
 +++ Gemfile
 @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', gem_versions['default_value_for']
@@ -9,7 +9,7 @@
  gem 'pg', '~> 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.27'
-@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1'
+@@ -118,7 +118,7 @@ gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.2.0'
  
  # for Google storage
@@ -18,7 +18,7 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
+@@ -169,7 +169,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -27,7 +27,7 @@
  
  # Colored output to console
  gem 'rainbow', '~> 2.2'
-@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0'
+@@ -222,7 +222,7 @@ gem 'kubeclient', '~> 3.0'
  gem 'd3_rails', '~> 3.5.0'
  
  # Sanitize user input
@@ -36,16 +36,16 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1'
+@@ -284,7 +284,7 @@ gem 'batch-loader', '~> 1.2.1'
  # Perf bar
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
 -gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 +gem 'peek-mysql2', '>= 1.1.0', group: :mysql
- gem 'peek-performance_bar', '~> 1.3.0'
  gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
-@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
+ gem 'peek-redis', '~> 1.2.0'
+@@ -292,99 +292,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -54,7 +54,7 @@
 -  gem 'influxdb', '~> 0.2', require: false
 -
    # Prometheus
-   gem 'prometheus-client-mmap', '~> 0.9.1'
+   gem 'prometheus-client-mmap', '~> 0.9.3'
    gem 'raindrops', '~> 0.18'
  end
  
@@ -135,6 +135,7 @@
 -  gem 'email_spec', '~> 1.6.0'
 -  gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 2.3.2'
+-  gem 'rails-controller-testing' if rails5? # Rails5 only gem.
 -  gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
 -  gem 'sham_rack', '~> 1.3.6'
 -  gem 'concurrent-ruby', '~> 1.0.5'
@@ -144,8 +145,3 @@
  gem 'octokit', '~> 4.8'
  
  gem 'mail_room', '~> 0.9.1'
-@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7'
- 
- # Asset synchronization
- gem 'asset_sync', '~> 2.2.0'
-+
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 3525fe458ecd..8a58ff7a8d67 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,15 @@
---- config/gitlab.yml.example.orig	2018-05-28 11:47:11 UTC
+--- config/gitlab.yml.example.orig	2018-06-06 20:30:27 UTC
 +++ config/gitlab.yml.example
-@@ -570,7 +570,7 @@ production: &base
+@@ -213,7 +213,7 @@ production: &base
+     # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
+     # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
+     admin:
+-      address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
++      address: unix:/usr/local/www/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
+ 
+   ## Mattermost
+   ## For enabling Add to Mattermost button
+@@ -572,7 +572,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -9,7 +18,7 @@
      # Default Gitaly authentication token. Can be overriden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -588,8 +588,8 @@ production: &base
+@@ -590,8 +590,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -20,7 +29,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -617,12 +617,12 @@ production: &base
+@@ -619,12 +619,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -36,7 +45,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -643,7 +643,7 @@ production: &base
+@@ -645,7 +645,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 4a7d41172fed..787483567f20 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	2018-02-22 10:46:29 UTC
+--- config/initializers/1_settings.rb.orig	2018-06-06 20:30:27 UTC
 +++ config/initializers/1_settings.rb
-@@ -252,12 +252,8 @@ Settings.gitlab['email_subject_suffix'] 
+@@ -125,12 +125,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'
diff --git a/www/gitlab/files/patch-lib_tasks_gitlab_setup.rake b/www/gitlab/files/patch-lib_tasks_gitlab_setup.rake
new file mode 100644
index 000000000000..23c8fb945ec0
--- /dev/null
+++ b/www/gitlab/files/patch-lib_tasks_gitlab_setup.rake
@@ -0,0 +1,12 @@
+--- lib/tasks/gitlab/setup.rake.orig	2018-06-21 08:18:34 UTC
++++ lib/tasks/gitlab/setup.rake
+@@ -1,7 +1,8 @@
+ namespace :gitlab do
+   desc "GitLab | Setup production application"
+   task setup: :gitlab_environment do
+-    check_gitaly_connection
++    # Remove this check, see https://gitlab.com/gitlab-org/gitlab-ce/issues/47483
++    #check_gitaly_connection
+     setup_db
+   end
+