Add latest changes from gitlab-org/gitlab@12-7-stable-ee

5 files changed, 50 insertions, 19 deletions

diff --git a/doc/install/README.md b/doc/install/README.md
index 441826687aa..6b497763d93 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -87,3 +87,7 @@ the above methods, provided the cloud provider supports it.
 - [Install GitLab on DigitalOcean](https://about.gitlab.com/blog/2016/04/27/getting-started-with-gitlab-and-digitalocean/): Install Omnibus GitLab on DigitalOcean.
 - _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md):
   Quickly test any version of GitLab on DigitalOcean using Docker Machine.
+
+## Securing your GitLab installation
+
+After completing your installation, check out our [recommended practices to secure your GitLab instance](../security/README.md#securing-your-gitlab-installation).
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 8165d3edabb..a3b9124a2ba 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -211,7 +211,7 @@ create the actual RDS instance.
 
 Now, it's time to create the database:
 
-1. Select **Instances** from the left menu and click **Create database**.
+1. Select **Databases** from the left menu and click **Create database**.
 1. Select PostgreSQL and click **Next**.
 1. Since this is a production server, let's choose "Production". Click **Next**.
 1. Let's see the instance specifications:
@@ -244,7 +244,7 @@ Once the database is created, connect to your new RDS instance to verify access
 and to install a required extension.
 
 You can find the host or endpoint by selecting the instance you just created and
-after the details drop down you'll find it labeled as 'Endpoint'. Do not to
+after the details dropdown menu you'll find it labeled as 'Endpoint'. Do not to
 include the colon and port number:
 
 ```sh
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index c789467175a..5baaec79048 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -226,7 +226,7 @@ connections:
 ![Azure - Add inbound security rules - HTTP](img/azure-add-inbound-sec-rule-http.png)
 
 1. Enter **"HTTP"** in the `Name` field
-1. Select **HTTP** from the options in the `Service` drop-down
+1. Select **HTTP** from the options in the `Service` dropdown list
 1. Make sure the `Action` is set to **Allow**
 1. Click **"OK"**
 
@@ -238,7 +238,7 @@ accept [SSH] connections:
 ![Azure - Add inbound security rules - SSH](img/azure-add-inbound-sec-rule-ssh.png)
 
 1. Enter **"SSH"** in the `Name` field
-1. Select **SSH** from the options in the `Service` drop-down
+1. Select **SSH** from the options in the `Service` dropdown list
 1. Make sure the `Action` is set to **Allow**
 1. Click **"OK"**
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index d420ac5e952..5cd8f98b2f3 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -224,9 +224,9 @@ Download Ruby and compile it:
 
 ```sh
 mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.3.tar.gz
-echo '2347ed6ca5490a104ebd5684d2b9b5eefa6cd33c  ruby-2.6.3.tar.gz' | shasum -c - && tar xzf ruby-2.6.3.tar.gz
-cd ruby-2.6.3
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.tar.gz
+echo '1416ce288fb8bfeae07a12b608540318c9cace71  ruby-2.6.5.tar.gz' | shasum -c - && tar xzf ruby-2.6.5.tar.gz
+cd ruby-2.6.5
 
 ./configure --disable-install-rdoc
 make
@@ -250,11 +250,11 @@ page](https://golang.org/dl).
 # Remove former Go installation folder
 sudo rm -rf /usr/local/go
 
-curl --remote-name --progress https://dl.google.com/go/go1.11.10.linux-amd64.tar.gz
-echo 'aefaa228b68641e266d1f23f1d95dba33f17552ba132878b65bb798ffa37e6d0  go1.11.10.linux-amd64.tar.gz' | shasum -a256 -c - && \
-  sudo tar -C /usr/local -xzf go1.11.10.linux-amd64.tar.gz
+curl --remote-name --progress https://dl.google.com/go/go1.13.5.linux-amd64.tar.gz
+echo '512103d7ad296467814a6e3f635631bd35574cab3369a97a323c9a585ccaa569  go1.13.5.linux-amd64.tar.gz' | shasum -a256 -c - && \
+  sudo tar -C /usr/local -xzf go1.13.5.linux-amd64.tar.gz
 sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
-rm go1.11.10.linux-amd64.tar.gz
+rm go1.13.5.linux-amd64.tar.gz
 ```
 
 ## 4. Node
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 106c7714bfe..9bc1658d59c 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -38,14 +38,40 @@ GitLab is developed for Linux-based operating systems.
 It does **not** run on Microsoft Windows, and we have no plans to support it in the near future. For the latest development status view this [issue](https://gitlab.com/gitlab-org/gitlab/issues/22337).
 Please consider using a virtual machine to run GitLab.
 
-## Ruby versions
+## Software requirements
 
-GitLab requires Ruby (MRI) 2.6. Support for Ruby versions below 2.6 (2.4, 2.5) will stop with GitLab 12.2.
+### Ruby versions
 
-You will have to use the standard MRI implementation of Ruby.
-We love [JRuby](https://www.jruby.org/) and [Rubinius](https://rubinius.com) but GitLab
+GitLab requires Ruby (MRI) 2.6. Beginning in GitLab 12.2, we  no longer support Ruby 2.5 and lower.
+
+You must use the standard MRI implementation of Ruby.
+We love [JRuby](https://www.jruby.org/) and [Rubinius](https://rubinius.com), but GitLab
 needs several Gems that have native extensions.
 
+### Go versions
+
+The minimum required Go version is 1.12.
+
+### Git versions
+
+GitLab 11.11 and higher only supports Git 2.21.x and newer, and
+[dropped support for older versions](https://gitlab.com/gitlab-org/gitlab-foss/issues/54255).
+
+### 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.
+
+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.
+
+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
+can find instructions to install from community maintained packages or compile
+from source at the [Node.js website](https://nodejs.org/en/download).
+
 ## Hardware requirements
 
 ### Storage
@@ -210,7 +236,7 @@ For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/inde
 
 ## Supported web browsers
 
-We support the current and the previous major release of:
+GitLab supports the following web browsers:
 
 - Firefox
 - Chrome/Chromium
@@ -218,10 +244,11 @@ We support the current and the previous major release of:
 - Microsoft Edge
 - Internet Explorer 11
 
-The browser vendors release regular minor version updates with important bug fixes and security updates.
-Support is only provided for the current minor version of the major version you are running.
+For the listed web browsers, GitLab supports:
 
-Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version.
+- The current and previous major versions of browsers except Internet Explorer.
+- Only version 11 of Internet Explorer.
+- The current minor version of a supported major version.
 
 NOTE: **Note:** We do not support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
 in the future because we have features such as Issue Boards which require JavaScript extensively.