summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-03-01 13:38:10 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-03-01 13:38:10 +0000
commitbfd84398dbddd24d60d3b5ad8fb78d26a9a20369 (patch)
treec2462c3d7d29f6dc3fc0bcf19adfe49f6c1ce1d9
parent462526280a8996975ab53a61fee4f74e5d2ed7fd (diff)
parent8ccb2d3275c5d16b5e0cd9bfb8a4c0f5939e20f3 (diff)
downloadgitlab-ce-bfd84398dbddd24d60d3b5ad8fb78d26a9a20369.tar.gz
Merge branch 'update-yarn-docs' into 'master'
Update docs to reflect Yarn support added in 8.17 not 9.0 See merge request !9590
-rw-r--r--doc/install/installation.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 5ba338ba7d1..bb4141c6cd3 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -155,10 +155,9 @@ page](https://golang.org/dl).
## 4. Node
Since GitLab 8.17, GitLab requires the use of node >= v4.3.0 to compile
-javascript assets, and starting in GitLab 9.0, yarn >= v0.17.0 is required to
-manage javascript dependencies. In many distros the versions provided by the
-official package repositories are out of date, so we'll need to install through
-the following commands:
+javascript assets, and yarn >= v0.17.0 to manage javascript dependencies.
+In many distros the versions provided by the official package repositories
+are out of date, so we'll need to install through the following commands:
# install node v7.x
curl --location https://deb.nodesource.com/setup_7.x | bash -