Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 46 insertions, 3 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 983c7ed577f..80f3f6ab092 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -271,10 +271,22 @@ sudo adduser --disabled-login --gecos 'GitLab' git
 NOTE:
 In GitLab 12.1 and later, only PostgreSQL is supported. In GitLab 13.0 and later, we [require PostgreSQL 11+](requirements.md#postgresql-requirements).
 
-1. Install the database packages:
+1. Install the database packages.
+
+   For Ubuntu 20.04 and later:
+
+   ```shell
+   sudo apt install -y postgresql postgresql-client libpq-dev postgresql-contrib
+   ```
+
+   For Ubuntu 18.04 and earlier, the available PostgreSQL doesn't meet the minimum
+   version requirement. You need to add PostgreSQL's repository:
 
    ```shell
-   sudo apt-get install -y postgresql postgresql-client libpq-dev postgresql-contrib
+   wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+   RELEASE=$(lsb_release -cs) echo "deb http://apt.postgresql.org/pub/repos/apt/ ${RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+   sudo apt update
+   sudo apt -y install postgresql-11 postgresql-client-11 libpq-dev
    ```
 
 1. Verify the PostgreSQL version you have is supported by the version of GitLab you're
@@ -426,7 +438,7 @@ Clone Enterprise Edition:
 
 ```shell
 # Clone GitLab repository
-sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab.git -b <X-Y-stable> gitlab
+sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab.git -b <X-Y-stable-ee> gitlab
 ```
 
 Make sure to replace `<X-Y-stable>` with the stable branch that matches the
@@ -1041,3 +1053,34 @@ On RedHat/CentOS:
 ```shell
 sudo yum groupinstall 'Development Tools'
 ```
+
+### Error compiling GitLab assets
+
+While compiling assets, you may receive the following error message:
+
+```plaintext
+Killed
+error Command failed with exit code 137.
+```
+
+This can occur when Yarn kills a container that runs out of memory. To fix this:
+
+1. Increase your system's memory to at least 8 GB.
+
+1. Run this command to clean the assets:
+
+   ```shell
+   sudo -u git -H bundle exec rake gitlab:assets:clean RAILS_ENV=production NODE_ENV=production
+   ```
+
+1. Run the `yarn` command again to resolve any conflicts:
+
+   ```shell
+   sudo -u git -H yarn install --production --pure-lockfile
+   ```
+
+1. Recompile the assets:
+
+   ```shell
+   sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
+   ```