summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-11-25 16:22:29 +0000
committerNick Thomas <nick@gitlab.com>2016-11-25 16:29:40 +0000
commit5981a0f365b9a312b87bfcebfb0d9365cb2f9c9a (patch)
tree878a601775178e5092acbaa6e42afdcc9e7482c2
parent838c1aad68e8c7f81a0b8778f46f0ce4e7c5439d (diff)
downloadgitlab-ce-5981a0f365b9a312b87bfcebfb0d9365cb2f9c9a.tar.gz
Update GitLab Workhorse to v1.0.1
v1.0.0 was mistakenly tagged with a lightweight, rather than annotated, tag, which caused compiled versions of workhorse to wrongly report their version.
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/workhorse-v1-0-1.yml4
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/update/8.13-to-8.14.md2
4 files changed, 7 insertions, 3 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 3eefcb9dd5b..7dea76edb3d 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/changelogs/unreleased/workhorse-v1-0-1.yml b/changelogs/unreleased/workhorse-v1-0-1.yml
new file mode 100644
index 00000000000..c26c2d45b1d
--- /dev/null
+++ b/changelogs/unreleased/workhorse-v1-0-1.yml
@@ -0,0 +1,4 @@
+---
+title: Update GitLab Workhorse to v1.0.1
+merge_request: 7759
+author:
diff --git a/doc/install/installation.md b/doc/install/installation.md
index dabd69d7466..ee02d6024d9 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -403,7 +403,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 v1.0.0
+ sudo -u git -H git checkout v1.0.1
sudo -u git -H make
### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.13-to-8.14.md b/doc/update/8.13-to-8.14.md
index 46ea19d11d0..a0e895773ce 100644
--- a/doc/update/8.13-to-8.14.md
+++ b/doc/update/8.13-to-8.14.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 v1.0.0
+sudo -u git -H git checkout v1.0.1
sudo -u git -H make
```