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
..
gitaly	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
gitlab-shell	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
gitlab-workhorse	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
rubyEnv-ce	gitlab-ce: 12.0.3 -> 12.1.6	2019-08-14 14:51:00 +02:00
rubyEnv-ee	gitlab-ee: 12.0.3 -> 12.1.6	2019-08-14 14:51:59 +02:00
data.json	gitlab-ee: 12.0.3 -> 12.1.6	2019-08-14 14:51:59 +02:00
default.nix	gitlab: remove gitlab-deb-data.tar after extracting from it	2019-08-14 14:45:08 +02:00
fix-grpc-ar.patch	gitlab: 11.10.8 -> 12.0.3	2019-07-14 23:03:39 +02:00
remove-hardcoded-locations.patch
reset_token.rake
update.py	gitlab: add gitaly go mod handling for the updater	2019-07-16 01:18:11 +02:00