diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 00:08:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 00:08:12 +0000 |
commit | 9ac561230fb7a94c8f8e35163fe47fdb9829b108 (patch) | |
tree | b44d58434301914890663eee246103596f106552 /doc | |
parent | 5aa96ff14229dba7e35f213354963febf3ad2833 (diff) | |
download | gitlab-ce-9ac561230fb7a94c8f8e35163fe47fdb9829b108.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/examples/end_to_end_testing_webdriverio/index.md | 2 | ||||
-rw-r--r-- | doc/development/database_review.md | 2 | ||||
-rw-r--r-- | doc/development/fe_guide/index.md | 2 | ||||
-rw-r--r-- | doc/install/installation.md | 2 | ||||
-rw-r--r-- | doc/install/requirements.md | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/ci/examples/end_to_end_testing_webdriverio/index.md b/doc/ci/examples/end_to_end_testing_webdriverio/index.md index 3402190c805..8c3156ec25c 100644 --- a/doc/ci/examples/end_to_end_testing_webdriverio/index.md +++ b/doc/ci/examples/end_to_end_testing_webdriverio/index.md @@ -49,7 +49,7 @@ visit a specific URL or interact with elements on the page. It can be programmat from a variety of programming languages. In this article we're going to be using the [WebdriverIO](https://webdriver.io/) JavaScript bindings, but the general concept should carry over pretty well to -[other programming languages supported by Selenium](https://selenium.dev/about/platforms.jsp#programming-languages). +[other programming languages supported by Selenium](https://www.selenium.dev/documentation/en/legacy_docs/selenium_rc/). ## Writing tests diff --git a/doc/development/database_review.md b/doc/development/database_review.md index 4e97e5961b6..5edaaf4512c 100644 --- a/doc/development/database_review.md +++ b/doc/development/database_review.md @@ -172,7 +172,7 @@ the following preparations into account. - If queries rely on prior migrations that are not present yet on production (eg indexes, columns), you can use a [one-off instance from the restore pipeline](https://ops.gitlab.net/gitlab-com/gl-infra/gitlab-restore/postgres-gprd) - in order to establish a proper testing environment. + in order to establish a proper testing environment. If you don't have access to this project, reach out to #database on Slack to get advice on how to proceed. - Avoid N+1 problems and minimalize the [query count](merge_request_performance_guidelines.md#query-counts). ### Timing guidelines for migrations diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md index ff69cb0e0ce..4e599049470 100644 --- a/doc/development/fe_guide/index.md +++ b/doc/development/fe_guide/index.md @@ -9,7 +9,7 @@ GitLab is built on top of [Ruby on Rails](https://rubyonrails.org) using [Haml][ Be wary of [the limitations that come with using Hamlit][hamlit-limits]. We also use [SCSS](https://sass-lang.com) and plain JavaScript with modern ECMAScript standards supported through [Babel][babel] and ES module support through [webpack][webpack]. -Working with our frontend assets requires Node (v8.10.0 or greater) and Yarn +Working with our frontend assets requires Node (v10.13.0 or greater) and Yarn (v1.10.0 or greater). You can find information on how to install these on our [installation guide][install]. diff --git a/doc/install/installation.md b/doc/install/installation.md index 161116473b9..61d04258e31 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -263,7 +263,7 @@ 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` >= v8.10.0. (We recommend node 12.x as it is faster) +- `node` >= v10.13.0. (We recommend node 12.x as it is faster) - `yarn` >= v1.10.0. In many distros, diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 9bc1658d59c..052a5d2782a 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -59,16 +59,16 @@ GitLab 11.11 and higher only supports Git 2.21.x and newer, and ### Node.js versions -Beginning in GitLab 11.8, we only support Node.js 8.10.0 or higher, and dropped -support for Node.js 6. +Beginning in GitLab 12.9, we only support node.js 10.13.0 or higher, and we have dropped +support for node.js 8. (node.js 6 support was dropped in GitLab 11.8) We recommend Node 12.x, as it is faster. GitLab uses [webpack](https://webpack.js.org/) to compile frontend assets, which requires a minimum -version of Node.js 8.10.0. +version of Node.js 10.13.0. You can check which version you are running with `node -v`. If you are running -a version older than `v8.10.0`, you need to update to a newer version. You +a version older than `v10.13.0`, you need to update to a newer version. You can find instructions to install from community maintained packages or compile from source at the [Node.js website](https://nodejs.org/en/download). |