diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 846bdeff48d3..fcb954e38843 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -34,12 +34,12 @@ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings. index 0bea8a4f4b..290248547b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git' - Settings.gitlab['user_home'] ||= begin +@@ -177,7 +177,7 @@ 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'] -+ '/homeless-shelter' + rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] ++ '/homeless-shelter' end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? |