3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/version-management/gitlab/gitaly
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
default.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
deps.nix gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00
Gemfile gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00
Gemfile.lock gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00
gemset.nix gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00