www/gitlab: Update from 10.1.6 to 10.4.4

Changelog: https://github.com/gitlabhq/gitlabhq/blob/v10.4.4/CHANGELOG.md

Submitted by: Matthias Fechner <idefix@fechner.net>
Reviewed by:  swills, tz

5 files changed, 47 insertions, 317 deletions

diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index 05f63293788e..640ab2b30662 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -41,6 +41,7 @@ restart_cmd="restart_gitlab"
 : ${gitlab_authBackend:="http://127.0.0.1:8080"}
 : ${gitlab_workhorse_tcp:="NO"}
 : ${gitlab_workhorse_addr:="127.0.0.1:8181"}
+: ${gitlab_mail_room_enable:="NO"}
 
 load_rc_config $name
 
@@ -56,7 +57,11 @@ socket_path="$app_root/tmp/sockets"
 rails_socket="$socket_path/gitlab.socket"
 web_server_pid_path="$pid_path/unicorn.pid"
 sidekiq_pid_path="$pid_path/sidekiq.pid"
-mail_room_enabled=false
+if checkyesno gitlab_mail_room_enable; then
+	mail_room_enabled=true
+else
+	mail_room_enabled=false
+fi
 mail_room_pid_path="$pid_path/mail_room.pid"
 gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 70b5605ad036..6b2193acda0d 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,116 +1,18 @@
---- Gemfile.orig	2018-01-11 16:23:59 UTC
+--- Gemfile.orig	2018-02-05 13:37:24 UTC
 +++ Gemfile
-@@ -1,55 +1,55 @@
- source 'https://rubygems.org'
- 
--gem 'rails', '4.2.8'
-+gem 'rails', '>=4.2.8'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- 
- # Responders respond_to and respond_with
- gem 'responders', '~> 2.0'
- 
--gem 'sprockets', '~> 3.7.0'
-+gem 'sprockets', '>= 3.7.0'
- 
- # Default values for AR models
+@@ -12,8 +12,8 @@ gem 'sprockets', '~> 3.7.0'
  gem 'default_value_for', '~> 3.0.0'
  
  # Supported DBs
--gem 'mysql2', '~> 0.4.5', group: :mysql
+-gem 'mysql2', '~> 0.4.10', group: :mysql
 -gem 'pg', '~> 0.18.2', group: :postgres
-+gem 'mysql2', '>= 0.4.5', group: :mysql
++gem 'mysql2', '>= 0.4.10', group: :mysql
 +gem 'pg', '>= 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.26.0'
  gem 'grape-route-helpers', '~> 2.1.0'
- 
--gem 'faraday', '~> 0.12'
-+gem 'faraday', '>= 0.12'
- 
- # Authentication libraries
- gem 'devise', '~> 4.2'
- gem 'doorkeeper', '~> 4.2.0'
- gem 'doorkeeper-openid_connect', '~> 1.2.0'
--gem 'omniauth', '~> 1.4.2'
--gem 'omniauth-auth0', '~> 1.4.1'
-+gem 'omniauth', '>= 1.4.2'
-+gem 'omniauth-auth0', '>= 1.4.1'
- gem 'omniauth-azure-oauth2', '~> 0.0.9'
- gem 'omniauth-cas3', '~> 1.1.4'
- gem 'omniauth-facebook', '~> 4.0.0'
- gem 'omniauth-github', '~> 1.1.1'
- gem 'omniauth-gitlab', '~> 1.0.2'
--gem 'omniauth-google-oauth2', '~> 0.5.2'
-+gem 'omniauth-google-oauth2', '>= 0.5.2'
- gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
- gem 'omniauth-oauth2-generic', '~> 0.2.2'
--gem 'omniauth-saml', '~> 1.7.0'
--gem 'omniauth-shibboleth', '~> 1.2.0'
--gem 'omniauth-twitter', '~> 1.2.0'
--gem 'omniauth_crowd', '~> 2.2.0'
-+gem 'omniauth-saml', '>= 1.7.0'
-+gem 'omniauth-shibboleth', '>= 1.2.0'
-+gem 'omniauth-twitter', '>= 1.2.0'
-+gem 'omniauth_crowd', '>= 2.2.0'
- gem 'omniauth-authentiq', '~> 0.3.1'
--gem 'rack-oauth2', '~> 1.2.1'
-+gem 'rack-oauth2', '>= 1.2.1'
- gem 'jwt', '~> 1.5.6'
- 
- # Spam and anti-bot protection
--gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
-+gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails'
- gem 'akismet', '~> 2.0'
- 
- # Two-factor authentication
- gem 'devise-two-factor', '~> 3.0.0'
- gem 'rqrcode-rails3', '~> 0.1.7'
--gem 'attr_encrypted', '~> 3.0.0'
-+gem 'attr_encrypted', '~> 3.0'
- gem 'u2f', '~> 0.2.1'
- 
- # GitLab Pages
-@@ -73,11 +73,11 @@ gem 'gollum-lib', '~> 4.2', require: fal
- gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
- 
- # Language detection
--gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-+gem 'github-linguist', '>= 4.7.0', require: 'linguist'
- 
- # API
- gem 'grape', '~> 1.0'
--gem 'grape-entity', '~> 0.6.0'
-+gem 'grape-entity', '~> 0.6'
- gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
- 
- # Disable strong_params so that Mash does not respond to :permitted?
-@@ -87,25 +87,25 @@ gem 'hashie-forbidden_attributes'
- gem 'kaminari', '~> 1.0'
- 
- # HAML
--gem 'hamlit', '~> 2.6.1'
-+gem 'hamlit', '>= 2.6.1'
- 
- # Files attachments
--gem 'carrierwave', '~> 1.1'
-+gem 'carrierwave', '>= 1.1'
- 
- # Drag and Drop UI
--gem 'dropzonejs-rails', '~> 0.7.1'
-+gem 'dropzonejs-rails', '>= 0.7.1'
- 
- # for backups
- gem 'fog-aws', '~> 1.4'
--gem 'fog-core', '~> 1.44'
--gem 'fog-google', '~> 0.5'
-+gem 'fog-core', '>= 1.44'
-+gem 'fog-google', '>= 0.5'
- gem 'fog-local', '~> 0.3'
- gem 'fog-openstack', '~> 0.1'
- gem 'fog-rackspace', '~> 0.1.1'
--gem 'fog-aliyun', '~> 0.1.0'
-+gem 'fog-aliyun', '>= 0.1.0'
+@@ -109,7 +109,7 @@ gem 'fog-rackspace', '~> 0.1.1'
+ gem 'fog-aliyun', '~> 0.2.0'
  
  # for Google storage
 -gem 'google-api-client', '~> 0.13.6'
@@ -118,38 +20,7 @@
  
  # for aws storage
  gem 'unf', '~> 0.1.4'
-@@ -115,32 +115,32 @@ gem 'seed-fu', '~> 2.3.5'
- 
- # Markdown and HTML processing
- gem 'html-pipeline', '~> 1.11.0'
--gem 'deckar01-task_list', '2.0.0'
--gem 'gitlab-markup', '~> 1.6.2'
-+gem 'deckar01-task_list', '>= 2.0.0'
-+gem 'gitlab-markup', '>= 1.6.2'
- gem 'redcarpet', '~> 3.4'
- gem 'RedCloth', '~> 4.3.2'
- gem 'rdoc', '~> 4.2'
- gem 'org-ruby', '~> 0.9.12'
- gem 'creole', '~> 0.5.0'
--gem 'wikicloth', '0.8.1'
-+gem 'wikicloth', '>= 0.8.1'
- gem 'asciidoctor', '~> 1.5.2'
--gem 'asciidoctor-plantuml', '0.0.7'
-+gem 'asciidoctor-plantuml', '>= 0.0.7'
- gem 'rouge', '~> 2.0'
- gem 'truncato', '~> 0.7.9'
- gem 'bootstrap_form', '~> 2.7.0'
- gem 'nokogiri', '~> 1.8.1'
- 
- # Diffs
--gem 'diffy', '~> 3.1.0'
-+gem 'diffy', '>= 3.1.0'
- 
- # Application server
- group :unicorn do
--  gem 'unicorn', '~> 5.1.0'
-+  gem 'unicorn', '>= 5.1.0'
-   gem 'unicorn-worker-killer', '~> 0.4.4'
+@@ -144,7 +144,7 @@ group :unicorn do
  end
  
  # State machine
@@ -158,15 +29,7 @@
  
  # Issue tags
  gem 'acts-as-taggable-on', '~> 4.0'
-@@ -148,17 +148,17 @@ gem 'acts-as-taggable-on', '~> 4.0'
- # Background jobs
- gem 'sidekiq', '~> 5.0'
- gem 'sidekiq-cron', '~> 0.6.0'
--gem 'redis-namespace', '~> 1.5.2'
-+gem 'redis-namespace', '>= 1.5.2'
- gem 'sidekiq-limit_fetch', '~> 3.4', require: false
- 
- # Cron Parser
+@@ -159,7 +159,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
@@ -174,44 +37,8 @@
 +gem 'httparty', '>= 0.13.3'
  
  # Colored output to console
--gem 'rainbow', '~> 2.2'
-+gem 'rainbow', '>= 2.2'
- 
- # GitLab settings
- gem 'settingslogic', '~> 2.0.9'
-@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1'
- 
- # Misc
- 
--gem 'version_sorter', '~> 2.1.0'
-+gem 'version_sorter', '>= 2.1.0'
- 
- # Cache
- gem 'redis-rails', '~> 5.0.2'
- 
- # Redis
--gem 'redis', '~> 3.2'
-+gem 'redis', '>= 3.2'
- gem 'connection_pool', '~> 2.0'
- 
- # HipChat integration
--gem 'hipchat', '~> 1.5.0'
-+gem 'hipchat', '>= 1.5.0'
- 
- # JIRA integration
--gem 'jira-ruby', '~> 1.4'
-+gem 'jira-ruby', '>= 1.4'
- 
- # Flowdock integration
- gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0'
- gem 'ruby-fogbugz', '~> 0.2.1'
- 
- # Kubernetes integration
--gem 'kubeclient', '~> 2.2.0'
-+gem 'kubeclient', '>= 2.2.0'
- 
- # d3
+ gem 'rainbow', '~> 2.2'
+@@ -209,7 +209,7 @@ gem 'kubeclient', '~> 2.2.0'
  gem 'd3_rails', '~> 3.5.0'
  
  # Sanitize user input
@@ -220,74 +47,16 @@
  gem 'babosa', '~> 1.0.2'
  
  # Sanitizes SVG input
--gem 'loofah', '~> 2.0.3'
-+gem 'loofah', '>= 2.0.3'
- 
- # Working with license
- gem 'licensee', '~> 8.7.0'
- 
- # Protect against bruteforcing
--gem 'rack-attack', '~> 4.4.1'
-+gem 'rack-attack', '>= 4.4.1'
- 
- # Ace editor
- gem 'ace-rails-ap', '~> 4.1.0'
-@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2'
- gem 'chronic_duration', '~> 0.10.6'
- 
- gem 'webpack-rails', '~> 0.9.10'
--gem 'rack-proxy', '~> 0.6.0'
-+gem 'rack-proxy', '>= 0.6.0'
- 
- gem 'sass-rails', '~> 5.0.6'
--gem 'uglifier', '~> 2.7.2'
-+gem 'uglifier', '>= 2.7.2'
- 
--gem 'addressable', '~> 2.5.2'
-+gem 'addressable', '>= 2.5.2'
- gem 'bootstrap-sass', '~> 3.3.0'
- gem 'font-awesome-rails', '~> 4.7'
- gem 'gemojione', '~> 3.3'
--gem 'gon', '~> 6.1.0'
--gem 'jquery-atwho-rails', '~> 1.3.2'
--gem 'jquery-rails', '~> 4.1.0'
--gem 'request_store', '~> 1.3'
-+gem 'gon', '>= 6.1.0'
-+gem 'jquery-atwho-rails', '>= 1.3.2'
-+gem 'jquery-rails', '>= 4.1.0'
-+gem 'request_store', '>= 1.3'
- gem 'select2-rails', '~> 3.5.9'
- gem 'virtus', '~> 1.0.1'
- gem 'base32', '~> 0.3.0'
- 
- # Sentry integration
--gem 'sentry-raven', '~> 2.5.3'
-+gem 'sentry-raven', '>= 2.5.3'
- 
--gem 'premailer-rails', '~> 1.9.7'
-+gem 'premailer-rails', '>= 1.9.7'
- 
- # I18n
- gem 'ruby_parser', '~> 3.8', require: false
- gem 'rails-i18n', '~> 4.0.9'
- gem 'gettext_i18n_rails', '~> 1.8.0'
--gem 'gettext_i18n_rails_js', '~> 1.2.0'
-+gem 'gettext_i18n_rails_js', '>= 1.2.0'
- gem 'gettext', '~> 3.2.2', require: false, group: :development
- 
- # Perf bar
+@@ -273,7 +273,7 @@ gem 'batch-loader', '~> 1.2.1'
  gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
  gem 'peek-host', '~> 1.0.0'
 -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-mysql2', '>= 1.1.0', group: :mysql
-+gem 'peek-performance_bar', '>= 1.3.0'
-+gem 'peek-pg', '>= 1.3.0', group: :postgres
+ gem 'peek-performance_bar', '~> 1.3.0'
+ gem 'peek-pg', '~> 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
- gem 'peek-redis', '~> 1.2.0'
- gem 'peek-sidekiq', '~> 1.0.3'
+@@ -282,97 +282,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
@@ -296,7 +65,7 @@
 -  gem 'influxdb', '~> 0.2', require: false
 -
    # Prometheus
-   gem 'prometheus-client-mmap', '~>0.7.0.beta18'
+   gem 'prometheus-client-mmap', '~> 0.7.0.beta44'
    gem 'raindrops', '~> 0.18'
  end
  
@@ -324,7 +93,7 @@
 -  gem 'fuubar', '~> 2.2.0'
 -
 -  gem 'database_cleaner', '~> 1.5.0'
--  gem 'factory_girl_rails', '~> 4.7.0'
+-  gem 'factory_bot_rails', '~> 4.8.2'
 -  gem 'rspec-rails', '~> 3.6.0'
 -  gem 'rspec-retry', '~> 0.4.5'
 -  gem 'spinach-rails', '~> 0.2.1'
@@ -339,18 +108,20 @@
 -  # Generate Fake data
 -  gem 'ffaker', '~> 2.4'
 -
--  gem 'capybara', '~> 2.15.0'
+-  gem 'capybara', '~> 2.15'
 -  gem 'capybara-screenshot', '~> 1.0.0'
--  gem 'poltergeist', '~> 1.9.0'
+-  gem 'selenium-webdriver', '~> 3.5'
 -
 -  gem 'spring', '~> 2.0.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -  gem 'spring-commands-spinach', '~> 1.1.0'
 -
--  gem 'rubocop', '~> 0.49.1', require: false
--  gem 'rubocop-rspec', '~> 1.15.1', require: false
--  gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
--  gem 'scss_lint', '~> 0.54.0', require: false
+-  gem 'gitlab-styles', '~> 2.2.0', require: false
+-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
+-  gem 'rubocop', '~> 0.52.0'
+-  gem 'rubocop-rspec', '~> 1.20.1'
+-
+-  gem 'scss_lint', '~> 0.56.0', require: false
 -  gem 'haml_lint', '~> 0.26.0', require: false
 -  gem 'simplecov', '~> 0.14.0', require: false
 -  gem 'flay', '~> 2.8.0', require: false
@@ -358,7 +129,7 @@
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
 -
--  gem 'license_finder', '~> 2.1.0', require: false
+-  gem 'license_finder', '~> 3.1', require: false
 -  gem 'knapsack', '~> 1.11.0'
 -
 -  gem 'activerecord_sane_schema_dumper', '0.2'
@@ -380,59 +151,24 @@
 -  gem 'test-prof', '~> 0.2.5'
 -end
 -
--gem 'octokit', '~> 4.6.2'
-+gem 'octokit', '>= 4.6.2'
+ gem 'octokit', '~> 4.6.2'
  
  gem 'mail_room', '~> 0.9.1'
- 
--gem 'email_reply_trimmer', '~> 0.1'
-+gem 'email_reply_trimmer', '>= 0.1'
- gem 'html2text'
- 
--gem 'ruby-prof', '~> 0.16.2'
-+gem 'ruby-prof', '>= 0.16.2'
- 
- # OAuth
--gem 'oauth2', '~> 1.4'
-+gem 'oauth2', '>= 1.4'
- 
- # Soft deletion
--gem 'paranoia', '~> 2.3.1'
-+gem 'paranoia', '>= 2.3.1'
- 
- # Health check
--gem 'health_check', '~> 2.6.0'
-+gem 'health_check', '>= 2.6.0'
- 
- # System information
- gem 'vmstat', '~> 2.3.0'
- gem 'sys-filesystem', '~> 1.1.6'
- 
- # SSH host key support
--gem 'net-ssh', '~> 4.1.0'
-+gem 'net-ssh', '>= 4.1.0'
- 
- # Required for ED25519 SSH host key support
- group :ed25519 do
-   gem 'rbnacl-libsodium'
--  gem 'rbnacl', '~> 4.0'
-+  gem 'rbnacl', '~> 4.0.2'
-   gem 'bcrypt_pbkdf', '~> 1.0'
+@@ -403,7 +317,7 @@ group :ed25519 do
  end
  
  # Gitaly GRPC client
--gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
-+gem 'gitaly-proto', '>= 0.39.0', require: 'gitaly'
+-gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly'
++gem 'gitaly-proto', '>= 0.64.0', require: 'gitaly'
  
--gem 'toml-rb', '~> 0.3.15', require: false
-+gem 'toml-rb', '>= 0.3.15', require: false
+ gem 'toml-rb', '~> 0.3.15', require: false
  
- # Feature toggles
- gem 'flipper', '~> 0.10.2'
-@@ -409,3 +325,6 @@ gem 'flipper-active_record', '~> 0.10.2'
- # Structured logging
+@@ -416,5 +330,8 @@ gem 'flipper-active_support_cache_store'
  gem 'lograge', '~> 0.5'
  gem 'grape_logging', '~> 1.7'
-+
+ 
 +gem 'rinku'
 +
++
+ # Asset synchronization
+ gem 'asset_sync', '~> 2.2.0'
diff --git a/www/gitlab/files/patch-config_database.yml.postgresql b/www/gitlab/files/patch-config_database.yml.postgresql
deleted file mode 100644
index 352b21431b4d..000000000000
--- a/www/gitlab/files/patch-config_database.yml.postgresql
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/database.yml.postgresql.orig	2017-11-14 20:51:25 UTC
-+++ config/database.yml.postgresql
-@@ -6,7 +6,7 @@ production:
-   encoding: unicode
-   database: gitlabhq_production
-   pool: 10
--  # username: git
-+  username: git
-   # password:
-   # host: localhost
-   # port: 5432
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 63207b2b1f18..c13408f63b15 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	2017-11-14 20:51:25 UTC
+--- config/gitlab.yml.example.orig	2018-01-22 14:26:07 UTC
 +++ config/gitlab.yml.example
-@@ -519,8 +519,8 @@ production: &base
+@@ -520,8 +520,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -11,7 +11,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -548,12 +548,12 @@ production: &base
+@@ -549,12 +549,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -27,7 +27,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -574,7 +574,7 @@ production: &base
+@@ -575,7 +575,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 2273256c3e6b..a6567db2cd2c 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -1,4 +1,4 @@
---- config/initializers/1_settings.rb.orig	2017-11-14 20:51:25 UTC
+--- config/initializers/1_settings.rb.orig	2018-01-22 14:26:07 UTC
 +++ config/initializers/1_settings.rb
 @@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] 
  Settings.gitlab['base_url']   ||= Settings.__send__(:build_base_gitlab_url)
@@ -13,5 +13,5 @@
 +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['password_authentication_enabled'] ||= true if Settings.gitlab['password_authentication_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'], [])