summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-27 09:23:45 +0000
committerRémy Coutable <remy@rymai.me>2016-07-27 13:29:03 +0200
commit0212383b08c0a7128e6473272359889cd9b80031 (patch)
tree9fb267a747fd3e231d225c771c8692cd6ecfa4bd
parenta77e3e0afe97458da9c36d6b6ded8b8b2a6c7ce2 (diff)
downloadgitlab-ce-0212383b08c0a7128e6473272359889cd9b80031.tar.gz
Merge branch 'update-gitlab-shell-version-in-doc' into 'master'
Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guide See merge request !5516 Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--CHANGELOG1
-rw-r--r--doc/update/8.9-to-8.10.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7dbcac9175a..fb933195858 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.10.2 (unreleased)
- Show release notes in tags list. !5503
- Fix a bug where forking a project from a repository storage to another would fail. !5509
- Fix missing schema update for `20160722221922`. !5512
+ - Update `gitlab-shell` version to 3.2.1 in the 8.9->8.10 update guide. !5516
v 8.10.1
- Refactor repository storages documentation. !5428
diff --git a/doc/update/8.9-to-8.10.md b/doc/update/8.9-to-8.10.md
index 71cbe5c8ac6..a057a423e61 100644
--- a/doc/update/8.9-to-8.10.md
+++ b/doc/update/8.9-to-8.10.md
@@ -46,7 +46,7 @@ sudo -u git -H git checkout 8-10-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags
-sudo -u git -H git checkout v3.2.0
+sudo -u git -H git checkout v3.2.1
```
### 5. Update gitlab-workhorse