summaryrefslogtreecommitdiff
path: root/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2018-09-06 19:09:19 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2018-09-06 19:09:19 +0000
commitaca0bebe8b62e7acbe86fecbd9557e7c3b805506 (patch)
tree2e7cb0dd68cb281245dbeb947b80f3f3302c7284 /www/gitlab-ce/files/patch-config_initializers_1__settings.rb
parentUpdate devel/gitaly to 0.117.2 which is required for gitlab-ce 11.2.x. (diff)
Update www/gitlab-ce to 11.2.3.
For a detailed changelog please see here: https://about.gitlab.com/2018/08/22/gitlab-11-2-released/ https://about.gitlab.com/2018/08/23/gitlab-11-2-1-released/ https://about.gitlab.com/2018/08/28/security-release-gitlab-11-dot-2-dot-2-released/ Approved by: mentors (implicit)
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 787483567f20..b8ed09f86371 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-06-06 20:30:27 UTC
+--- config/initializers/1_settings.rb.orig 2018-08-22 22:40:32 UTC
+++ config/initializers/1_settings.rb
-@@ -125,12 +125,8 @@ Settings.gitlab['email_subject_suffix']
+@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix']
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'