Commit 2df034ba authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab: Update software to gitlab 8.5 + friends

Update GitLab software to

    - gitlab-ce 8.5.1 + NXD patches

      https://lab.nexedi.com/kirr/gitlab-ce/commits/8-5-nxd

    - gitlab-shell to 2.6.10 + 1 patch to remove unneeded hooks.old in *.git

      https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/40

    - gitlab-workhorse 0.6.4 + NXD patches.

      https://lab.nexedi.com/kirr/gitlab-workhorse/commits/y/blobraw-4
      https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/17

      ( download speedup patches got improved, and now also properly
        proxy _gitlab_session cookie to auth backend, so raw files for
        private repositories now open in browser ok )

This only updates software and begins SR update to 8.5 - for now gitlab
instance becomes non-working -- we'll pull in configuration files
updates and fixups in the following patches.

P.S. we also pin-up rubygems version, used to build gems, along the way.
parent caaf6825
...@@ -68,7 +68,7 @@ eggs = ...@@ -68,7 +68,7 @@ eggs =
# rubygemsrecipe with fixed url and this way pinned rubygems version # rubygemsrecipe with fixed url and this way pinned rubygems version
[rubygemsrecipe] [rubygemsrecipe]
recipe = 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 # bundler, that we'll use to
...@@ -112,25 +112,26 @@ git-executable = ${git:location}/bin/git ...@@ -112,25 +112,26 @@ git-executable = ${git:location}/bin/git
<= git-repository <= git-repository
#repository = https://gitlab.com/gitlab-org/gitlab-ce.git #repository = https://gitlab.com/gitlab-org/gitlab-ce.git
repository = https://lab.nexedi.com/kirr/gitlab-ce.git repository = https://lab.nexedi.com/kirr/gitlab-ce.git
# 8.4.X + NXD patches: # 8.5.X + NXD patches:
revision = v8.4.4-18-g32fa1180aca0b5c119f9a42ecfc733db1fad1dc0 revision = v8.5.1-13-g73c204d506a24ba0b09db5513628c8bf8863b76a
location = ${buildout:parts-directory}/gitlab location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository] [gitlab-shell-repository]
<= git-repository <= git-repository
repository = https://gitlab.com/gitlab-org/gitlab-shell.git #repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# gitlab 8.4 wants gitlab-shell 2.6.10 repository = https://lab.nexedi.com/kirr/gitlab-shell.git
# 2.6.10 # gitlab 8.5 wants gitlab-shell 2.6.10
revision = v2.6.10-0-g82b3a4e8f70692ec679d880628fdb0f5844d42b9 # 2.6.10 + no-hooks.old patch
revision = v2.6.10-13-gcb8f331c955aa780efe10263d0d45b332f030f42
location = ${buildout:parts-directory}/gitlab-shell location = ${buildout:parts-directory}/gitlab-shell
[gitlab-workhorse-repository] [gitlab-workhorse-repository]
<= git-repository <= git-repository
#repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git #repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
repository = https://lab.nexedi.com/kirr/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
# (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/17) # (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/17)
revision = 0.6.1-2-ga23a5e18486b0de6e3435711dc555c8bfe08fde2 revision = 0.6.4-2-g86b2a17f24f6c369774bbb388560e4aa9a4321c1
location = ${buildout:parts-directory}/gitlab-workhorse location = ${buildout:parts-directory}/gitlab-workhorse
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment