Commit 4457e2d5 authored by Kirill Smelkov's avatar Kirill Smelkov

X upgrade gitlab + found how to fix redis

https://github.com/redis-store/redis-store/pull/251
parent d34a9129
......@@ -110,7 +110,7 @@ environment =
[gitlab-repository]
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-ce.git
revision = v7.12.0.rc3-6-gbef405333c2527a78ef5c2f438000e822e39669d
revision = v7.13.0.rc2-0-gae44e5ec064aaa9f5063732dc7bb6ee751a80ce2
location = ${buildout:parts-directory}/gitlab
git-executable = ${git:location}/bin/git
......@@ -118,7 +118,7 @@ git-executable = ${git:location}/bin/git
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# FIXME pin gitlab-shell version properly (wrt gitlab) ?
revision = v2.6.3-0-g4d30c0c
revision = v2.6.3-5-ga338189
location = ${buildout:parts-directory}/gitlab-shell
git-executable = ${git:location}/bin/git
......
......@@ -3,6 +3,4 @@
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/resque.yml.example
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
#production: redis://[${request-redis:connection-redis_ip}]:${request-redis:connection-redis_port}
# XXX redis does not remove [] for host from [host]:port
production: redis://${request-redis:connection-redis_ip}:${request-redis:connection-redis_port}
production: redis://[${request-redis:connection-redis_ip}]:${request-redis:connection-redis_port}
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