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: 681926fa83d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3410d73b2012
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 29, 2018

  1. gitlab test: fix eval 

    Still doesn't work, but better than before
    @globin
    globin committed Mar 29, 2018
    Copy the full SHA
    3410d73 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 nixos/tests/gitlab.nix
8 changes: 7 additions & 1 deletion nixos/tests/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,13 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.memorySize = 768;
services.gitlab.enable = true;
services.gitlab.databasePassword = "gitlab";
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
services.gitlab.secrets = {
secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
db = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
jws = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
otp = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
};
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "infinite";
};
};