summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Lee <mattl@gitlab.com>2016-12-12 19:16:27 +0000
committerMatt Lee <mattl@gitlab.com>2016-12-12 19:16:27 +0000
commit2bb6f24301e6d0a5134fbc304f9404e79be3e4a6 (patch)
tree9d932248088fe456c99d28d74c75e7ed34bb2ee6
parentb544ec8670f8a14d205fa0b13e8ca37fad795686 (diff)
parent98d42e9f85b0636632b77a67d1a20d64eb6ed22a (diff)
downloadgitlab-ce-2bb6f24301e6d0a5134fbc304f9404e79be3e4a6.tar.gz
Merge branch 'cherry-pick-f55fc1ec' into 'mattl-gitshell-fixes' mattl-gitshell-fixes
8.14 requires GitLab shell 4.0.3 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !8049
-rw-r--r--doc/update/8.13-to-8.14.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/8.13-to-8.14.md b/doc/update/8.13-to-8.14.md
index a0e895773ce..c64d3407461 100644
--- a/doc/update/8.13-to-8.14.md
+++ b/doc/update/8.13-to-8.14.md
@@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-14-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags
-sudo -u git -H git checkout v4.0.0
+sudo -u git -H git checkout v4.0.3
```
### 6. Update gitlab-workhorse