.

software/gitlab/software.cfg

@@ -68,7 +68,7 @@ eggs    =
 # rubygemsrecipe with fixed url and this way pinned rubygems version
 [rubygemsrecipe]
 recipe  = rubygemsrecipe
-url     = https://rubygems.org/rubygems/rubygems-2.5.1.zip
+url     = https://rubygems.org/rubygems/rubygems-2.5.2.zip
 
 
 # bundler, that we'll use to
@@ -110,14 +110,17 @@ git-executable = ${git:location}/bin/git
 #repository = https://gitlab.com/gitlab-org/gitlab-ce.git
 repository = https://lab.nexedi.com/kirr/gitlab-ce.git
 # 8.4.X + NXD patches:
-revision = v8.4.4-18-g32fa1180aca0b5c119f9a42ecfc733db1fad1dc0
+#revision = v8.4.4-18-g32fa1180aca0b5c119f9a42ecfc733db1fad1dc0
+branch = 8-5-nxd-x
+develop = true
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]
 <= git-repository
 repository = https://gitlab.com/gitlab-org/gitlab-shell.git
-# gitlab 8.4 wants gitlab-shell 2.6.10
+# gitlab 8.5 wants gitlab-shell 2.6.10
 # 2.6.10
+# TODO + no hooks.old patch
 revision = v2.6.10-0-g82b3a4e8f70692ec679d880628fdb0f5844d42b9
 location = ${buildout:parts-directory}/gitlab-shell
 
@@ -125,9 +128,10 @@ location = ${buildout:parts-directory}/gitlab-shell
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
 repository = https://lab.nexedi.com/kirr/gitlab-workhorse.git
-# 0.6.X + NXD patches for blob download speedup
+# 0.6.4 + NXD patches for blob download speedup (TODO)
 # (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/17)
-revision = 0.6.1-2-ga23a5e18486b0de6e3435711dc555c8bfe08fde2
+revision = 0.6.4-0-g3f8da4ae570ca6e79c795f343dad278d60edd343
+develop = true
 location = ${buildout:parts-directory}/gitlab-workhorse