summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
diff options
context:
space:
mode:
authorYaya <mak@nyantec.com>2023-05-23 12:09:27 +0000
committerYureka <yuka@yuka.dev>2023-05-31 22:14:25 +0200
commit4321e48b6851f187696bd4ef544cd2f6e6dfbd8b (patch)
tree2fa3f53e25f13b691fcfe3b7dd1ba7dd98494caf /pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
parent33411f27686e7535254879c0fddaa93a67ea4774 (diff)
downloadnixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar.gz
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar.bz2
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar.lz
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar.xz
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.tar.zst
nixpkgs-4321e48b6851f187696bd4ef544cd2f6e6dfbd8b.zip
nixos/gitlab: Remove procps from gitaly service
From my understanding, procps was added to the gitlay systemd service
path in #58487 to fix gitaly-ruby's internal memory leak detection.

Now that the last ruby remnants have been removed in gitaly 16.0.0,
this should not be necessary anymore.
Diffstat (limited to 'pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch')
-rw-r--r--pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 2b505307405..e7d704237ae 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -31,10 +31,10 @@ index da1a15302da..c846db93e5c 100644
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 99335321f28..9d9d1c48af4 100644
+index d096174fca3a..02d0f689c523 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -185,7 +185,7 @@
+@@ -206,7 +206,7 @@
  Settings.gitlab['user_home'] ||= begin
    Etc.getpwnam(Settings.gitlab['user']).dir
  rescue ArgumentError # no user configured
@@ -43,13 +43,13 @@ index 99335321f28..9d9d1c48af4 100644
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -794,7 +794,7 @@
+@@ -959,7 +959,7 @@
  # Git
  #
- Settings['git'] ||= Settingslogic.new({})
+ Settings['git'] ||= {}
 -Settings.git['bin_path'] ||= '/usr/bin/git'
 +Settings.git['bin_path'] ||= 'git'
- 
+
  # Important: keep the satellites.path setting until GitLab 9.0 at
  # least. This setting is fed to 'rm -rf' in
 diff --git a/config/puma.rb.example b/config/puma.rb.example