www/gitlab: Update from 8.7.5 to 8.8.5

Changelog: https://github.com/gitlabhq/gitlabhq/blob/8-8-stable/CHANGELOG

PR:          209903
Approved by: swills (mentor)

6 files changed, 55 insertions, 49 deletions

diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index 3c1f5dc7f67b..01da466575a5 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -2,8 +2,6 @@
 
 # $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 13828112580e..c0c52969d652 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2016-04-27 09:47:33 UTC
+--- Gemfile.orig	2016-06-15 01:41:18 UTC
 +++ Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
@@ -25,14 +25,13 @@
  
  # Authentication libraries
  gem 'devise',                 '~> 3.5.4'
+ gem 'doorkeeper',             '~> 3.1'
 -gem 'devise-async',           '~> 0.9.0'
--gem 'doorkeeper',             '~> 2.2.0'
 +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'
-@@ -29,25 +28,24 @@ gem 'omniauth-cas3',          '~> 1.1.2'
+@@ -29,13 +28,12 @@ gem 'omniauth-cas3',          '~> 1.1.2'
  gem 'omniauth-facebook',      '~> 3.0.0'
  gem 'omniauth-github',        '~> 1.1.1'
  gem 'omniauth-gitlab',        '~> 1.0.0'
@@ -45,9 +44,10 @@
  gem 'omniauth_crowd',         '~> 2.2.0'
 -gem 'rack-oauth2',            '~> 1.2.1'
 +gem 'rack-oauth2',            '>= 1.2.1'
+ gem 'jwt'
  
  # Spam and anti-bot protection
- gem 'recaptcha', require: 'recaptcha/rails'
+@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -63,7 +63,7 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
-@@ -60,15 +58,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
+@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', 
  
  # Git Wiki
  # Required manually in config/initializers/gollum.rb to control load order
@@ -83,7 +83,7 @@
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
  # Pagination
-@@ -78,13 +76,13 @@ gem "kaminari", "~> 0.16.3"
+@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
@@ -99,7 +99,7 @@
  gem "unf", '~> 0.1.4'
  
  # Authorization
-@@ -96,13 +94,13 @@ gem "seed-fu", '~> 2.3.5'
+@@ -97,13 +95,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'
@@ -116,7 +116,7 @@
  gem 'asciidoctor',   '~> 1.5.2'
  gem 'rouge',         '~> 1.10.1'
  
-@@ -111,11 +109,11 @@ gem 'rouge',         '~> 1.10.1'
+@@ -112,16 +110,16 @@ gem 'rouge',         '~> 1.10.1'
  gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
  
  # Diffs
@@ -130,7 +130,13 @@
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
-@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
+ # State machine
+-gem "state_machines-activerecord", '~> 0.3.0'
++gem "state_machines-activerecord", '>= 0.3.0'
+ # Run events after state machine commits
+ gem 'after_commit_queue'
+ 
+@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
  gem "gemnasium-gitlab-service", "~> 0.2"
  
  # Slack integration
@@ -143,7 +149,7 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.2.1'
-@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0'
+@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0'
  gem "underscore-rails", "~> 1.8.0"
  
  # Sanitize user input
@@ -152,20 +158,19 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
-@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3"
- gem 'licensee', '~> 8.0.0'
+ gem "loofah", "~> 2.0.3"
+ 
+ # Working with license
+-gem 'licensee', '~> 8.0.0'
++gem 'licensee', '>= 8.0.0'
  
  # Protect against bruteforcing
 -gem "rack-attack", '~> 4.3.1'
 +gem "rack-attack", '>= 4.3.1'
  
  # Ace editor
--gem 'ace-rails-ap', '~> 2.0.1'
-+gem 'ace-rails-ap', '>= 2.0.1'
- 
- # Keyboard shortcuts
- gem 'mousetrap-rails', '~> 1.4.6'
-@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3'
+ gem 'ace-rails-ap', '~> 4.0.2'
+@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3'
  
  gem "sass-rails", '~> 5.0.0'
  gem "coffee-rails", '~> 4.1.0'
@@ -179,11 +184,8 @@
  gem 'bootstrap-sass',     '~> 3.3.0'
  gem 'font-awesome-rails', '~> 4.2'
  gem 'gitlab_emoji',       '~> 0.3.0'
- gem 'gon',                '~> 6.0.1'
- gem 'jquery-atwho-rails', '~> 1.3.2'
--gem 'jquery-rails',       '~> 4.0.0'
-+gem 'jquery-rails',       '>= 4.0.0'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
+ gem 'jquery-rails',       '~> 4.1.0'
  gem 'jquery-ui-rails',    '~> 5.0.0'
  gem 'raphael-rails',      '~> 2.1.2'
 -gem 'request_store',      '~> 1.3.0'
@@ -192,9 +194,10 @@
  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', '~> 0.15'
+@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15'
  
  gem 'premailer-rails', '~> 1.9.0'
  
@@ -209,8 +212,7 @@
 -  gem "foreman"
 -  gem 'brakeman', '~> 3.2.0', require: false
 -
--  gem "annotate", "~> 2.7.0"
--  gem "letter_opener", '~> 1.1.2'
+-  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'quiet_assets', '~> 1.0.2'
 -  gem 'rerun', '~> 0.11.0'
 -  gem 'bullet', require: false
@@ -237,7 +239,7 @@
 -
 -  gem 'database_cleaner',   '~> 1.4.0'
 -  gem 'factory_girl_rails', '~> 4.6.0'
--  gem 'rspec-rails',        '~> 3.3.0'
+-  gem 'rspec-rails',        '~> 3.4.0'
 -  gem 'rspec-retry'
 -  gem 'spinach-rails',      '~> 0.2.1'
 -  gem 'spinach-rerun-reporter', '~> 0.0.2'
@@ -282,7 +284,7 @@
  group :production do
    gem "gitlab_meta", '7.0'
  end
-@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0.
+@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth
@@ -291,5 +293,8 @@
  
  # Soft deletion
  gem "paranoia", "~> 2.0"
-+
+ 
 +gem "rinku"
++
+ # Health check
+ gem 'health_check', '~> 1.5.1'
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 532cd364a1e9..e2ab46bd4b59 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-22 10:01:37 UTC
+--- config/gitlab.yml.example.orig	2016-06-15 01:41:18 UTC
 +++ config/gitlab.yml.example
-@@ -437,11 +437,11 @@ production: &base
+@@ -448,11 +448,11 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -8,13 +8,14 @@
 +    path: /usr/local/share/gitlab-shell/
  
      # REPOS_PATH MUST NOT BE A SYMLINK!!!
-     repos_path: /home/git/repositories/
+-    repos_path: /home/git/repositories/
 -    hooks_path: /home/git/gitlab-shell/hooks/
++    repos_path: /usr/home/git/repositories/
 +    hooks_path: /usr/local/share/gitlab-shell/hooks/
  
      # 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).
-@@ -458,7 +458,7 @@ production: &base
+@@ -469,7 +469,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 c8472f45d3e6..cbc3ca9a04c4 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-22 10:01:37 UTC
+--- config/initializers/1_settings.rb.orig	2016-06-15 01:41:18 UTC
 +++ config/initializers/1_settings.rb
-@@ -167,11 +167,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -191,12 +191,8 @@ 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'
@@ -9,7 +9,9 @@
 -rescue ArgumentError # no user configured
 -  '/home/' + Settings.gitlab['user']
 -end
-+Settings.gitlab['user_home']  ||= '/home/' + Settings.gitlab['user']
- Settings.gitlab['time_zone']  ||= nil
+-Settings.gitlab['time_zone'] ||= nil
++Settings.gitlab['user_home']  ||= '/usr/home/' + Settings.gitlab['user']
++Settings.gitlab['time_zone']  ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
  Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
+ Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab
index 57360ce8ec8c..5ab7a3d38834 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-22 10:01:37 UTC
+--- lib/support/nginx/gitlab.orig	2016-06-15 01:41:18 UTC
 +++ lib/support/nginx/gitlab
 @@ -17,7 +17,7 @@
  ## See installation.md#using-https for additional HTTPS configuration details.
@@ -9,10 +9,10 @@
  }
  
  ## Normal HTTP host
-@@ -62,7 +62,7 @@ server {
-   error_page 500 /500.html;
+@@ -63,7 +63,7 @@ server {
    error_page 502 /502.html;
-   location ~ ^/(404|422|500|502)\.html$ {
+   error_page 503 /503.html;
+   location ~ ^/(404|422|500|502|503)\.html$ {
 -    root /home/git/gitlab/public;
 +    root /usr/local/www/gitlab/public;
      internal;
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
index 78f42d7dab39..304eefe52c01 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-22 10:01:37 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2016-06-15 01:41:18 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
-@@ -106,7 +106,7 @@ server {
-   error_page 500 /500.html;
+@@ -107,7 +107,7 @@ server {
    error_page 502 /502.html;
-   location ~ ^/(404|422|500|502)\.html$ {
+   error_page 503 /503.html;
+   location ~ ^/(404|422|500|502|503)\.html$ {
 -    root /home/git/gitlab/public;
-+    root /usr/local/www/gitlab/public;
++    root /home/git/gitlab/public; 
      internal;
    }
  }