diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-12 16:15:17 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-12 16:15:17 +0300 |
| commit | 24c84e32a4e656aaa2cedff735bcf9a0e044af1c (patch) | |
| tree | ebf444de6701d1af569b232233bdd484de10826d | |
| parent | a87d619a1cbcf8ff41d1c4b5f48c25d59ddc895c (diff) | |
| parent | 1bb4f1529315901f512100a484889591b391ce4e (diff) | |
Merge branch 'master' into 'master'
Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
See merge request !12078
| -rw-r--r-- | doc/update/9.1-to-9.2.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/9.1-to-9.2.md b/doc/update/9.1-to-9.2.md index 19db6e5763e..e7d97fde14e 100644 --- a/doc/update/9.1-to-9.2.md +++ b/doc/update/9.1-to-9.2.md @@ -110,8 +110,8 @@ sudo -u git -H bin/compile ### 7. Update gitlab-workhorse Install and compile gitlab-workhorse. This requires -[Go 1.5](https://golang.org/dl) which should already be on your system from -GitLab 8.1. GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). +[Go 1.8](https://golang.org/dl). Go (at least 1.5) should already be on your system from +GitLab 8.1 and shall be upgraded if necessary. Please note that starting in Gitlab 9.3, only Go 1.8.3 and above will be supported. GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). If you are not using Linux you may have to run `gmake` instead of `make` below. |