mirror of
https://git.freebsd.org/ports.git
synced 2025-05-28 08:56:28 -04:00
2b6a89e02f
This commit includes also a suggestion from Robert Nagy <robert@openbsd.org> to use the git version from gitlab in the gitaly port which is now required. Thanks again for this contributation! Put the gitlab and git version into a common Makefile that is included in every port that requires the same version like gitlab has. Changes: https://about.gitlab.com/releases/2024/07/18/gitlab-17-2-released/ Changes: https://about.gitlab.com/releases/2024/08/15/gitlab-17-3-released/
15 lines
780 B
Ruby
15 lines
780 B
Ruby
--- config/initializers/1_settings.rb.orig 2024-08-20 19:36:17 UTC
|
|
+++ config/initializers/1_settings.rb
|
|
@@ -210,11 +210,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
|
|
Settings.gitlab['user'] ||= 'git'
|
|
# External configuration may cause the ssh user to differ from the GitLab user
|
|
Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
|
|
-Settings.gitlab['user_home'] ||= begin
|
|
- Etc.getpwnam(Settings.gitlab['user']).dir
|
|
-rescue ArgumentError # no user configured
|
|
- '/home/' + Settings.gitlab['user']
|
|
-end
|
|
+Settings.gitlab['user_home'] ||= '/usr/local/git'
|
|
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?
|