summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-24 19:28:23 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-24 19:28:23 +0000
commitcd6157d559c453c9ba5dc9dcb6a451c3b25a4545 (patch)
tree16a8ad2dec02dbdafc439d8a516d07bc040ce549
parent952c501fdf4a22e7ec06f825a36a4cbf5465d090 (diff)
parent3ae4e1ebf7826340d0a4a15e350c614b6223f06f (diff)
downloadgitlab-ce-cd6157d559c453c9ba5dc9dcb6a451c3b25a4545.tar.gz
Merge branch 'workhorse-0.7.11' into 'master'
Use gitlab-workhorse 0.7.11 Versions 0.7.9 and 0.7.10 crash on previously valid 'authBackend' settings. I don't know how many people are affected by this, 'normal' Omnibus installations are not. (If they were gitlab.com would have stopped working :) ). Still this is something we should not ship. Unfortunately 8-11-stable uses 0.7.10 (but 8.11.0 does not). So I think we need to put this in the next 8.11 patch release. See merge request !5983
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--doc/install/installation.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 5b209ea2067..b4d6d12101f 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.7.10
+0.7.11
diff --git a/doc/install/installation.md b/doc/install/installation.md
index b0ec9b4a961..d4b89fa8345 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -397,7 +397,7 @@ If you are not using Linux you may have to run `gmake` instead of
cd /home/git
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
cd gitlab-workhorse
- sudo -u git -H git checkout v0.7.10
+ sudo -u git -H git checkout v0.7.11
sudo -u git -H make
### Initialize Database and Activate Advanced Features