Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 403aa2dfed75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be2f711342d8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 28, 2019

  1. nixos/gitaly: Run gitaly with procps in scope 

    Gitaly uses `ps` to track the RSS of `gitlab-ruby` and kills it when it
detects excessive memory leakage. See
https://gitlab.com/gitlab-org/gitaly/issues/1562.
    @bgamari
    bgamari committed Mar 28, 2019
    Copy the full SHA
    b90f5f0 View commit details

  2. Merge pull request #58487 from bgamari/gitlab-gitaly-procpc 

    gitaly: Run gitaly with procps in scope
    @infinisil
    infinisil authored Mar 28, 2019
    Copy the full SHA
    be2f711 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 nixos/modules/services/misc/gitlab.nix
1 change: 1 addition & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -534,6 +534,7 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
gitAndTools.git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby