Add latest changes from gitlab-org/gitlab@master

6 files changed, 16 insertions, 16 deletions

diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 061030765a3..ab89446d9ec 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -487,7 +487,7 @@ gitlab=# \q
 
 ---
 
-### Configuring GitLab to connect with postgres and Redis
+### Configuring GitLab to connect with PostgreSQL and Redis
 
 Edit the `gitlab.rb` file at `/etc/gitlab/gitlab.rb`
 find the `external_url 'http://gitlab.example.com'` option and change it
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index bd96db91a2c..daf6eb2ba40 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -376,7 +376,7 @@ terminal window:
 
 Once the update process has completed, you'll see a message like this:
 
-```
+```plaintext
 Upgrade complete! If your GitLab server is misbehaving try running
 
    sudo gitlab-ctl restart
diff --git a/doc/install/google_cloud_platform/index.md b/doc/install/google_cloud_platform/index.md
index aba30870640..9fcf6e6420c 100644
--- a/doc/install/google_cloud_platform/index.md
+++ b/doc/install/google_cloud_platform/index.md
@@ -90,14 +90,14 @@ here's how you configure GitLab to be aware of the change:
 
 1. Edit the config file of Omnibus GitLab using your favorite text editor:
 
-   ```
+   ```shell
    sudo vim /etc/gitlab/gitlab.rb
    ```
 
 1. Set the `external_url` value to the domain name you wish GitLab to have
    **without** `https`:
 
-   ```
+   ```ruby
    external_url 'http://gitlab.example.com'
    ```
 
@@ -105,7 +105,7 @@ here's how you configure GitLab to be aware of the change:
 
 1. Reconfigure GitLab for the changes to take effect:
 
-   ```
+   ```shell
    sudo gitlab-ctl reconfigure
    ```
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 33367d6063f..deef2cef21b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -47,7 +47,7 @@ If the highest number stable branch is unclear, check the [GitLab blog](https://
 This is the main directory structure you will end up with following the instructions
 of this page:
 
-```
+```plaintext
 |-- home
 |   |-- git
 |       |-- .ssh
@@ -147,7 +147,7 @@ ldd /usr/local/bin/git | grep pcre2
 
 The output should be similar to:
 
-```
+```plaintext
 libpcre2-8.so.0 => /usr/lib/libpcre2-8.so.0 (0x00007f08461c3000)
 ```
 
@@ -904,7 +904,7 @@ for the changes to take effect.
 
 If you'd like to connect to a Redis server on a non-standard port or a different host, you can configure its connection string via the `config/resque.yml` file.
 
-```
+```yaml
 # example
 production:
   url: redis://redis.example.tld:6379
@@ -912,7 +912,7 @@ production:
 
 If you want to connect the Redis server via socket, use the "unix:" URL scheme and the path to the Redis socket file in the `config/resque.yml` file.
 
-```
+```yaml
 # example
 production:
   url: unix:/path/to/redis/socket
@@ -920,7 +920,7 @@ production:
 
 Also, you can use environment variables in the `config/resque.yml` file:
 
-```
+```yaml
 # example
 production:
   url: <%= ENV.fetch('GITLAB_REDIS_URL') %>
@@ -930,7 +930,7 @@ production:
 
 If you are running SSH on a non-standard port, you must change the GitLab user's SSH config.
 
-```
+```plaintext
 # Add to /home/git/.ssh/config
 host localhost          # Give your setup a name (here: override localhost)
     user git            # Your remote git user
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md
index 232ad2f1509..2689fcb1645 100644
--- a/doc/install/openshift_and_gitlab/index.md
+++ b/doc/install/openshift_and_gitlab/index.md
@@ -184,7 +184,7 @@ Sometimes though, you may encounter some issues, like OpenShift not running
 when booting up the VM. The web UI may not responding or you may see issues
 when trying to login with `oc`, like:
 
-```
+```plaintext
 The connection to the server 10.2.2.2:8443 was refused - did you specify the right host or port?
 ```
 
@@ -403,7 +403,7 @@ Let's see how to do that using the following steps.
 
    The output will be similar to:
 
-   ```
+   ```plaintext
    NAME                   CLUSTER-IP       EXTERNAL-IP   PORT(S)         AGE
    gitlab-ce              172.30.243.177   <none>        22/TCP,80/TCP   5d
    gitlab-ce-postgresql   172.30.116.75    <none>        5432/TCP        5d
@@ -436,7 +436,7 @@ Let's see how to do that using the following steps.
 
    which will return something like:
 
-   ```
+   ```plaintext
    NAME          DESIRED   CURRENT   AGE
    gitlab-ce-2   2         2         5d
    ```
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 375137adad3..e85f82e1c1a 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -147,7 +147,7 @@ Users using PostgreSQL must ensure the `pg_trgm` extension is loaded into every
 GitLab database. This extension can be enabled (using a PostgreSQL super user)
 by running the following query for every database:
 
-```
+```sql
 CREATE EXTENSION pg_trgm;
 ```
 
@@ -170,7 +170,7 @@ If you are using [GitLab Geo](../development/geo.md):
   [postgres_fdw](https://www.postgresql.org/docs/9.6/postgres-fdw.html)
   extension.
 
-```
+```sql
 CREATE EXTENSION postgres_fdw;
 ```