summaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2019-04-23 08:27:13 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2019-04-23 08:27:13 +0000
commitc39ae03f678861da446fb053832f083950753f7f (patch)
treecfab65122337d3bcf98cf5b3c4e16c430f44e282 /www/gitlab-ce/files/patch-config_initializers_1__settings.rb
parentUpgrade to 9.0.0 which is required for Gitlab 11.10 upgrade. (diff)
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!
Diffstat (limited to 'www/gitlab-ce/files/patch-config_initializers_1__settings.rb')
-rw-r--r--www/gitlab-ce/files/patch-config_initializers_1__settings.rb4
1 files changed, 2 insertions, 2 deletions
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'