Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2019-01-10 20:35:01 +0300
committerLukas Eipert <leipert@gitlab.com>2019-01-14 14:41:39 +0300
commit5bacf494fc31de124d2ab277f27fd72c8706ea06 (patch)
tree08ba444d371df21f6a7bc5a8a15be1c00faf3cc4
parent06df35f41b70e55615a42fcf1673b84da91082e2 (diff)
Update FE developer and installation documentation
-rw-r--r--doc/development/fe_guide/index.md4
-rw-r--r--doc/install/installation.md4
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md
index ad87ecf1b87..3a3cb77f592 100644
--- a/doc/development/fe_guide/index.md
+++ b/doc/development/fe_guide/index.md
@@ -21,8 +21,8 @@ We also use [Axios][axios] to handle all of our network requests.
We also utilize [webpack][webpack] to handle the bundling, minification, and
compression of our assets.
-Working with our frontend assets requires Node (v6.0 or greater) and Yarn
-(v1.2 or greater). You can find information on how to install these on our
+Working with our frontend assets requires Node (v8.10.0 or greater) and Yarn
+(v1.10.0 or greater). You can find information on how to install these on our
[installation guide][install].
### Browser Support
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 5653c59f576..67b3d9ce66a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -164,10 +164,11 @@ page](https://golang.org/dl).
Since GitLab 8.17, GitLab requires the use of Node to compile javascript
assets, and Yarn to manage javascript dependencies. The current minimum
-requirements for these are node >= v6.0.0 and yarn >= v1.2.0. In many distros
+requirements for these are node >= v8.10.0 and yarn >= v1.10.0. 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:
+```bash
# install node v8.x
curl --location https://deb.nodesource.com/setup_8.x | sudo bash -
sudo apt-get install -y nodejs
@@ -176,6 +177,7 @@ we'll need to install through the following commands:
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update
sudo apt-get install yarn
+```
Visit the official websites for [node](https://nodejs.org/en/download/package-manager/) and [yarn](https://yarnpkg.com/en/docs/install/) if you have any trouble with these steps.