summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-14 16:21:29 +0000
committerRémy Coutable <remy@rymai.me>2016-10-14 16:21:29 +0000
commitc2ca8a75064587ae17600fecb53e8c572505f1c4 (patch)
treea0a74049feba05c72516e5d5732d141038c3a292
parent9458703572988e40872db2ff8812c6932cdc3974 (diff)
parent513f061b5b521a1a428a05ebc467784f672ae07b (diff)
downloadgitlab-ce-c2ca8a75064587ae17600fecb53e8c572505f1c4.tar.gz
Merge branch 'gitlab-workhorse-0.8.5' into 'master'
Use gitlab-workhorse 0.8.5 ## What does this MR do? Bump gitlab-workhorse to 0.8.5 ## Why was this MR needed? Fixes to the diff and patch endpoints. See https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/68#note_16919390 See merge request !6891
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/update/8.12-to-8.13.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index b60d71966ae..7ada0d303f3 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.8.4
+0.8.5
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 1fa8678223a..c9acc9cdfb0 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -400,7 +400,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.8.4
+ sudo -u git -H git checkout v0.8.5
sudo -u git -H make
### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.12-to-8.13.md b/doc/update/8.12-to-8.13.md
index 00d63c1b3c6..8940d14559b 100644
--- a/doc/update/8.12-to-8.13.md
+++ b/doc/update/8.12-to-8.13.md
@@ -84,7 +84,7 @@ GitLab 8.1.
```bash
cd /home/git/gitlab-workhorse
sudo -u git -H git fetch --all
-sudo -u git -H git checkout v0.8.4
+sudo -u git -H git checkout v0.8.5
sudo -u git -H make
```