summaryrefslogtreecommitdiff
path: root/www/gitlab/files/patch-config_initializers_1__settings.rb
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2016-04-13 16:46:42 +0000
committerKurt Jaeger <pi@FreeBSD.org>2016-04-13 16:46:42 +0000
commit4297ad5d482f37e5b046605bf8a0dcb8384e95d2 (patch)
treea82f211354466f8b7a68489ec05cbb2a841cddec /www/gitlab/files/patch-config_initializers_1__settings.rb
parentThe shebangfix is no longer needed here now that the script (diff)
www/gitlab: 8.5.5 -> 8.6.5
PR: 208511 Submitted by: Torsten Zuehlsdorff <ports@toco-domains.de> (maintainer) Reviewed by: xmj, miks.mikelsons@gmail.com
Diffstat (limited to 'www/gitlab/files/patch-config_initializers_1__settings.rb')
-rw-r--r--www/gitlab/files/patch-config_initializers_1__settings.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
index ac81ac7bcd42..80f6c8f9e549 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig 2016-03-10 19:32:49 UTC
+--- config/initializers/1_settings.rb.orig 2016-04-04 10:12:21 UTC
+++ config/initializers/1_settings.rb
-@@ -165,11 +165,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -166,11 +166,7 @@ Settings.gitlab['email_reply_to'] ||= EN
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'