Upgrade to 11.10.

For full log see:
https://about.gitlab.com/2019/04/22/gitlab-11-10-released/

WARNING, this release switches the path were the repositories are
stored back to the default git home dir. Make sure you read the
UPDATING 20190423 entry and follow the update maual very carefully!

4 files changed, 67 insertions, 29 deletions

diff --git a/www/gitlab-ce/files/gitlab.in b/www/gitlab-ce/files/gitlab.in
index 7320e30adc7a..6a57d5234975 100644
--- a/www/gitlab-ce/files/gitlab.in
+++ b/www/gitlab-ce/files/gitlab.in
@@ -13,8 +13,8 @@
 # chkconfig: - 85 14
 ### END INIT INFO
 
-# Maintainer: Torsten Zuehlsdorff <ports@toco-domains.de>
-# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx
+# Maintainer: Matthias Fechner <mfechner@FreeBSD.org>
+# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx, @tz
 
 # PROVIDE: gitlab
 # REQUIRE: LOGIN
@@ -42,6 +42,7 @@ restart_cmd="restart_gitlab"
 : ${gitlab_workhorse_tcp:="NO"}
 : ${gitlab_workhorse_addr:="127.0.0.1:8181"}
 : ${gitlab_mail_room_enable:="NO"}
+: ${gitlab_allow_conflicts:="NO"}
 
 load_rc_config $name
 
@@ -86,6 +87,44 @@ gitaly_log="$app_root/log/gitaly.log"
 # Read configuration variable file if it is present
 test -f /etc/default/gitlab && . /etc/default/gitlab
 
+# Check if other colliding packages are installed
+if `/usr/sbin/pkg -N info -e gogs` && [ $? -eq 0 ]; then
+  echo "WARNING: Gitlab cannot run together with gogs as both of them modify .ssh/authorized_keys"
+  if checkyesno gitlab_allow_conflicts; then
+    echo "but start as overwritten"
+  else
+    echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES"
+    exit 1
+  fi
+fi
+if `/usr/sbin/pkg -N info -e "gitolite*"` && [ $? -eq 0 ]; then
+  echo "WARNING: Gitlab cannot run together with gitolite as both of them modify .ssh/authorized_keys"
+  if checkyesno gitlab_allow_conflicts; then
+    echo "but start as overwritten"
+  else
+    echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES"
+    exit 1
+  fi
+fi
+if `/usr/sbin/pkg -N info -e "*gitosis*"` && [ $? -eq 0 ]; then
+  echo "WARNING: Gitlab cannot run together with py-gitosis as both of them modify .ssh/authorized_keys"
+  if checkyesno gitlab_allow_conflicts; then
+    echo "but start as overwritten"
+  else
+    echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES"
+    exit 1
+  fi
+fi
+if `/usr/sbin/pkg -N info -e gitea` && [ $? -eq 0 ]; then
+  echo "WARNING: Gitlab cannot run together with gitea as both of them modify .ssh/authorized_keys"
+  if checkyesno gitlab_allow_conflicts; then
+    echo "but start as overwritten"
+  else
+    echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES"
+    exit 1
+  fi
+fi
+
 # Switch to the app_user if it is not he/she who is running the script.
 if [ "$USER" != "$app_user" ]; then
   # Regenerate the Gemfile.lock for all related products
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index c8a02b214140..6cee6306bfe5 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,13 +1,5 @@
---- Gemfile.orig	2019-03-20 23:32:21 UTC
+--- Gemfile.orig	2019-04-19 09:51:35 UTC
 +++ Gemfile
-@@ -1,6 +1,6 @@
- source 'https://rubygems.org'
- 
--gem 'rails', '5.0.7.1'
-+gem 'rails', '5.0.7.2'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- 
- # Improves copy-on-write performance for MRI
 @@ -15,7 +15,7 @@ gem 'sprockets', '~> 3.7.0'
  gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
  
@@ -17,16 +9,16 @@
  gem 'pg', '~> 1.1', group: :postgres
  
  gem 'rugged', '~> 0.28'
-@@ -170,7 +170,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si
- gem 'fugit', '~> 1.1'
+@@ -202,7 +202,7 @@ gem 'connection_pool', '~> 2.0'
+ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
- # HTTP requests
--gem 'httparty', '~> 0.13.3'
-+gem 'httparty', '>= 0.13.3'
+ # HipChat integration
+-gem 'hipchat', '~> 1.5.0'
++gem 'hipchat', '~> 1.6.0'
  
- # Colored output to console
- gem 'rainbow', '~> 3.0'
-@@ -295,9 +295,6 @@ gem 'peek-redis', '~> 1.2.0'
+ # JIRA integration
+ gem 'jira-ruby', '~> 1.4'
+@@ -293,9 +293,6 @@ gem 'peek-redis', '~> 1.2.0'
  
  # Metrics
  group :metrics do
@@ -36,7 +28,7 @@
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.9.4'
    gem 'raindrops', '~> 0.18'
-@@ -307,87 +304,6 @@ group :tracing do
+@@ -305,87 +302,6 @@ group :tracing do
    # OpenTracing
    gem 'opentracing', '~> 0.4.3'
    gem 'jaeger-client', '~> 0.10.0'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 389b871ccce2..e16c7584f6f9 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,4 +1,4 @@
---- config/gitlab.yml.example.orig	2019-03-20 23:32:21 UTC
+--- config/gitlab.yml.example.orig	2019-04-19 09:51:35 UTC
 +++ config/gitlab.yml.example
 @@ -248,7 +248,7 @@ production: &base
      # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
@@ -9,7 +9,7 @@
  
    ## Mattermost
    ## For enabling Add to Mattermost button
-@@ -645,7 +645,7 @@ production: &base
+@@ -649,7 +649,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -18,27 +18,34 @@
      # Default Gitaly authentication token. Can be overridden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -663,8 +663,8 @@ production: &base
+@@ -667,8 +667,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
 -        path: /home/git/repositories/
 -        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
-+        path: /usr/home/git/repositories/
-+        gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
++        path: /usr/local/git/repositories/
++        gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -696,7 +696,7 @@ production: &base
+@@ -700,12 +700,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
 -    path: /home/git/gitlab-shell/
+-    authorized_keys_file: /home/git/.ssh/authorized_keys
 +    path: %%PREFIX%%/share/gitlab-shell/
++    authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys
  
      # 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).
-@@ -721,7 +721,7 @@ production: &base
+-    # secret_file: /home/git/gitlab/.gitlab_shell_secret
++    # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret
+ 
+     # Git over HTTP
+     upload_pack: true
+@@ -726,7 +726,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
index 6d8a929a7a4f..cd757c71b9c5 100644
--- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2018-12-21 14:23:37 UTC
+--- config/initializers/1_settings.rb.orig	2019-04-19 09:51:35 UTC
 +++ config/initializers/1_settings.rb
-@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
+@@ -145,12 +145,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
  Settings.gitlab['base_url']   ||= Settings.__send__(:build_base_gitlab_url)
  Settings.gitlab['url']        ||= Settings.__send__(:build_gitlab_url)
  Settings.gitlab['user']       ||= 'git'