summaryrefslogtreecommitdiff
path: root/www/gitlab/files/patch-config_initializers_1__settings.rb
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2016-04-29 14:25:11 +0000
committerKurt Jaeger <pi@FreeBSD.org>2016-04-29 14:25:11 +0000
commit37912dfbd58086e155e7f028dd960bd6abd8a945 (patch)
tree64d113d2a517a418eaaebc39640478bf8984f9e3 /www/gitlab/files/patch-config_initializers_1__settings.rb
parentUse LIB_DEPENDS. (diff)
www/gitlab: 8.6.6 -> 8.7.0
Changes: https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG PR: 209138 Submitted by: Torsten Zuehlsdorff <ports@toco-domains.de> (maintainer)
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 80f6c8f9e549..c8472f45d3e6 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-04-04 10:12:21 UTC
+--- config/initializers/1_settings.rb.orig 2016-04-22 10:01:37 UTC
+++ config/initializers/1_settings.rb
-@@ -166,11 +166,7 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -167,11 +167,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'