diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-07-04 17:38:29 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-07-04 17:38:29 +0000 |
| commit | 78a51eed7eb6cabe06abe26e70e662c45cefda16 (patch) | |
| tree | ec8245d7db6c351fc3cf838ed25a9abdb0baf779 /www/gitlab-ce/files/patch-config_initializers_1__settings.rb | |
| parent | Just use the JSONXS variable rather than repeating it (diff) | |
Updated gitlab to 11.0.2.
For detailed list of changes please see here:
https://about.gitlab.com/2018/06/22/gitlab-11-0-released/
Please make sure before you upgrade you read the entry in UPDATING.
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16127
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.rb | 17 |
1 files changed, 17 insertions, 0 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 new file mode 100644 index 000000000000..787483567f20 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -0,0 +1,17 @@ +--- config/initializers/1_settings.rb.orig 2018-06-06 20:30:27 UTC ++++ config/initializers/1_settings.rb +@@ -125,12 +125,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' +-Settings.gitlab['user_home'] ||= begin +- Etc.getpwnam(Settings.gitlab['user']).dir +-rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] +-end +-Settings.gitlab['time_zone'] ||= nil ++Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user'] ++Settings.gitlab['time_zone'] ||= nil + Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? + Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? + Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) |