diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-01-25 19:59:44 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-01-25 19:59:44 +0000 |
| commit | 10d8026f69efe83a0f4759f91c5087effd676191 (patch) | |
| tree | 156073bbda5a76ba7651644b53ab0a77d9d4bdb6 | |
| parent | af95ba2fb481be62722438e5d93b074b1d3f89cb (diff) | |
| parent | b997d2ae82f0ea6a6a65d32da002ca9bd6e87a0c (diff) | |
| download | gitlab-ce-10d8026f69efe83a0f4759f91c5087effd676191.tar.gz | |
Merge branch 'update-node-docs' into 'master'
fix documentation about node version
Closes #41438
See merge request gitlab-org/gitlab-ce!16720
| -rw-r--r-- | changelogs/unreleased/update-node-docs.yml | 5 | ||||
| -rw-r--r-- | doc/update/10.2-to-10.3.md | 7 | ||||
| -rw-r--r-- | doc/update/10.3-to-10.4.md | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/changelogs/unreleased/update-node-docs.yml b/changelogs/unreleased/update-node-docs.yml new file mode 100644 index 00000000000..a1d9d12f0ca --- /dev/null +++ b/changelogs/unreleased/update-node-docs.yml @@ -0,0 +1,5 @@ +--- +title: fix documentation about node version +merge_request: 16720 +author: Tobias Gurtzick +type: other diff --git a/doc/update/10.2-to-10.3.md b/doc/update/10.2-to-10.3.md index d6e2db8a353..f8fe4a4b6bf 100644 --- a/doc/update/10.2-to-10.3.md +++ b/doc/update/10.2-to-10.3.md @@ -54,17 +54,16 @@ sudo gem install bundler --no-ri --no-rdoc ### 4. Update Node -GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets and -it has a minimum requirement of node v4.3.0. +GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets. +We require a minimum version of node v6.0.0. You can check which version you are running with `node -v`. If you are running -a version older than `v4.3.0` you will need to update to a newer version. You +a version older than `v6.0.0` you will need to update to a newer version. You can find instructions to install from community maintained packages or compile from source at the nodejs.org website. <https://nodejs.org/en/download/> - Since 8.17, GitLab requires the use of yarn `>= v0.17.0` to manage JavaScript dependencies. diff --git a/doc/update/10.3-to-10.4.md b/doc/update/10.3-to-10.4.md index 67b7e634c94..083f6090a8a 100644 --- a/doc/update/10.3-to-10.4.md +++ b/doc/update/10.3-to-10.4.md @@ -56,17 +56,16 @@ sudo gem install bundler --no-ri --no-rdoc ### 4. Update Node -GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets and -it has a minimum requirement of node v4.3.0. +GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets. +We require a minimum version of node v6.0.0. You can check which version you are running with `node -v`. If you are running -a version older than `v4.3.0` you will need to update to a newer version. You +a version older than `v6.0.0` you will need to update to a newer version. You can find instructions to install from community maintained packages or compile from source at the nodejs.org website. <https://nodejs.org/en/download/> - Since 8.17, GitLab requires the use of yarn `>= v0.17.0` to manage JavaScript dependencies. |