summaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2019-10-24 17:05:56 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2019-10-24 17:05:56 +0000
commit256b4f4dddf057f4141925913bdd101d769491d4 (patch)
tree1ab7fbe07fa1a507e1aaef6758fad7ab0eb55f69 /www/gitlab-ce/files/patch-config_initializers_1__settings.rb
parentwww/gitlab-workhorse: upgrade to 8.14.0 which is required for gitlab-ce 12.4 ... (diff)
www/gitlab-ce: upgrade to 12.4.0.
Changelog: https://about.gitlab.com/blog/2019/10/22/gitlab-12-4-released/
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 f0f62560ceb0..f2877d2f3f7d 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 2019-07-26 17:57:42 UTC
+--- config/initializers/1_settings.rb.orig 2019-10-22 12:01:49 UTC
+++ config/initializers/1_settings.rb
-@@ -174,12 +174,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
+@@ -178,12 +178,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'