Add latest changes from gitlab-org/gitlab@master

10 files changed, 42 insertions, 42 deletions

diff --git a/doc/administration/file_hooks.md b/doc/administration/file_hooks.md
index 5ef739a4289..89b454a73a0 100644
--- a/doc/administration/file_hooks.md
+++ b/doc/administration/file_hooks.md
@@ -105,7 +105,7 @@ bundle exec rake file_hooks:validate RAILS_ENV=production
 
 Example of output:
 
-```
+```plaintext
 Validating file hooks from /plugins directory
 * /home/git/gitlab/plugins/save_to_file.clj succeed (zero exit code)
 * /home/git/gitlab/plugins/save_to_file.rb failure (non-zero exit code)
diff --git a/doc/administration/geo/replication/faq.md b/doc/administration/geo/replication/faq.md
index b07b518d3b1..8a3439d2aaa 100644
--- a/doc/administration/geo/replication/faq.md
+++ b/doc/administration/geo/replication/faq.md
@@ -45,7 +45,7 @@ query.
 
 ## Can I `git push` to a **secondary** node?
 
-Yes!  Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/blog/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
+Yes!  Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/releases/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
 
 ## How long does it take to have a commit replicated to a **secondary** node?
 
diff --git a/doc/administration/geo/replication/index.md b/doc/administration/geo/replication/index.md
index 04f61775b29..e3699f1544b 100644
--- a/doc/administration/geo/replication/index.md
+++ b/doc/administration/geo/replication/index.md
@@ -63,7 +63,7 @@ Keep in mind that:
   - Get user data for logins (API).
   - Replicate repositories, LFS Objects, and Attachments (HTTPS + JWT).
 - Since GitLab Premium 10.0, the **primary** node no longer talks to **secondary** nodes to notify for changes (API).
-- Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/blog/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
+- Pushing directly to a **secondary** node (for both HTTP and SSH, including Git LFS) was [introduced](https://about.gitlab.com/releases/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
 - There are [limitations](#current-limitations) in the current implementation.
 
 ### Architecture
diff --git a/doc/administration/geo/replication/security_review.md b/doc/administration/geo/replication/security_review.md
index 68bf5b5d23a..3da71cab48d 100644
--- a/doc/administration/geo/replication/security_review.md
+++ b/doc/administration/geo/replication/security_review.md
@@ -2,8 +2,8 @@
 
 The following security review of the Geo feature set focuses on security aspects of
 the feature as they apply to customers running their own GitLab instances. The review
-questions are based in part on the [OWASP Application Security Verification Standard Project](https://www.owasp.org/index.php/Category:OWASP_Application_Security_Verification_Standard_Project)
-from [owasp.org](https://www.owasp.org/index.php/Main_Page).
+questions are based in part on the [OWASP Application Security Verification Standard Project](https://owasp.org/www-project-application-security-verification-standard/)
+from [owasp.org](https://www.owasp.org/).
 
 ## Business Model
 
diff --git a/doc/administration/geo/replication/using_a_geo_server.md b/doc/administration/geo/replication/using_a_geo_server.md
index 37982f2756c..b814bcf8459 100644
--- a/doc/administration/geo/replication/using_a_geo_server.md
+++ b/doc/administration/geo/replication/using_a_geo_server.md
@@ -4,7 +4,7 @@
 
 After you set up the [database replication and configure the Geo nodes][req], use your closest GitLab node as you would a normal standalone GitLab instance.
 
-Pushing directly to a **secondary** node (for both HTTP, SSH including Git LFS) was [introduced](https://about.gitlab.com/blog/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
+Pushing directly to a **secondary** node (for both HTTP, SSH including Git LFS) was [introduced](https://about.gitlab.com/releases/2018/09/22/gitlab-11-3-released/) in [GitLab Premium](https://about.gitlab.com/pricing/#self-managed) 11.3.
 
 Example of the output you will see when pushing to a **secondary** node:
 
diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md
index 738eb87d53d..3689a604840 100644
--- a/doc/administration/pages/source.md
+++ b/doc/administration/pages/source.md
@@ -98,7 +98,7 @@ The Pages daemon doesn't listen to the outside world.
 
 1. Install the Pages daemon:
 
-   ```
+   ```bash
    cd /home/git
    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
    cd gitlab-pages
@@ -160,7 +160,7 @@ outside world.
 
 1. Install the Pages daemon:
 
-   ```
+   ```bash
    cd /home/git
    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
    cd gitlab-pages
@@ -225,7 +225,7 @@ world. Custom domains are supported, but no TLS.
 
 1. Install the Pages daemon:
 
-   ```
+   ```bash
    cd /home/git
    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
    cd gitlab-pages
@@ -290,7 +290,7 @@ world. Custom domains and TLS are supported.
 
 1. Install the Pages daemon:
 
-   ```
+   ```bash
    cd /home/git
    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
    cd gitlab-pages
@@ -353,20 +353,20 @@ not remove the backslashes.
 
 If your GitLab Pages domain is `example.io`, replace:
 
-```bash
+```nginx
 server_name ~^.*\.YOUR_GITLAB_PAGES\.DOMAIN$;
 ```
 
 with:
 
-```
+```nginx
 server_name ~^.*\.example\.io$;
 ```
 
 If you are using a subdomain, make sure to escape all dots (`.`) except from
 the first one with a backslash (\). For example `pages.example.io` would be:
 
-```
+```nginx
 server_name ~^.*\.pages\.example\.io$;
 ```
 
diff --git a/doc/administration/raketasks/check.md b/doc/administration/raketasks/check.md
index eb230f02c0d..7f3405df060 100644
--- a/doc/administration/raketasks/check.md
+++ b/doc/administration/raketasks/check.md
@@ -33,7 +33,7 @@ integrity check described previously.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:git:fsck
 ```
 
@@ -58,7 +58,7 @@ Currently, integrity checks are supported for the following types of file:
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:artifacts:check
 sudo gitlab-rake gitlab:lfs:check
 sudo gitlab-rake gitlab:uploads:check
@@ -90,7 +90,7 @@ sudo gitlab-rake gitlab:uploads:check BATCH=100 ID_FROM=50 ID_TO=250
 
 Example output:
 
-```
+```bash
 $ sudo gitlab-rake gitlab:uploads:check
 Checking integrity of Uploads
 - 1..1350: Failures: 0
@@ -107,7 +107,7 @@ Done!
 
 Example verbose output:
 
-```
+```bash
 $ sudo gitlab-rake gitlab:uploads:check VERBOSE=1
 Checking integrity of Uploads
 - 1..1350: Failures: 0
diff --git a/doc/administration/raketasks/geo.md b/doc/administration/raketasks/geo.md
index 09f72c3411d..8bf720d2872 100644
--- a/doc/administration/raketasks/geo.md
+++ b/doc/administration/raketasks/geo.md
@@ -11,7 +11,7 @@ This is equivalent of running `git repack -d` on a _bare_ repository.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake geo:git:housekeeping:incremental_repack
 ```
 
@@ -29,7 +29,7 @@ when this is enabled in GitLab.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake geo:git:housekeeping:full_repack
 ```
 
@@ -46,7 +46,7 @@ a reachability bitmap index when this is enabled in GitLab.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake geo:git:housekeeping:gc
 ```
 
@@ -63,7 +63,7 @@ can remove them using the rake task `geo:run_orphaned_project_registry_cleaner`:
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake geo:run_orphaned_project_registry_cleaner
 ```
 
diff --git a/doc/administration/raketasks/ldap.md b/doc/administration/raketasks/ldap.md
index 36db98a2102..41a9a4192cf 100644
--- a/doc/administration/raketasks/ldap.md
+++ b/doc/administration/raketasks/ldap.md
@@ -9,7 +9,7 @@ using the command below.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:ldap:check
 ```
 
@@ -41,7 +41,7 @@ instead.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:ldap:group_sync
 ```
 
@@ -101,7 +101,7 @@ sudo gitlab-rake gitlab:ldap:rename_provider[ldapmain,ldapmycompany]
 
 Example output:
 
-```
+```plaintext
 100 users with provider 'ldapmain' will be updated to 'ldapmycompany'.
 If the new provider is incorrect, users will be unable to sign in.
 Do you want to continue (yes/no)? yes
@@ -128,7 +128,7 @@ bundle exec rake gitlab:ldap:rename_provider RAILS_ENV=production
 
 **Example output:**
 
-```
+```plaintext
 What is the old provider? Ex. 'ldapmain': ldapmain
 What is the new provider? Ex. 'ldapcustom': ldapmycompany
 ```
diff --git a/doc/administration/raketasks/maintenance.md b/doc/administration/raketasks/maintenance.md
index 149b8d62309..efc7a84a80e 100644
--- a/doc/administration/raketasks/maintenance.md
+++ b/doc/administration/raketasks/maintenance.md
@@ -6,19 +6,19 @@ This command gathers information about your GitLab installation and the System i
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:env:info
 ```
 
 **Source Installation**
 
-```
+```bash
 bundle exec rake gitlab:env:info RAILS_ENV=production
 ```
 
 Example output:
 
-```
+```plaintext
 System information
 System:           Debian 7.8
 Current User:     git
@@ -66,13 +66,13 @@ You may also have a look at our Troubleshooting Guides:
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:check
 ```
 
 **Source Installation**
 
-```
+```bash
 bundle exec rake gitlab:check RAILS_ENV=production
 ```
 
@@ -80,7 +80,7 @@ NOTE: Use `SANITIZE=true` for `gitlab:check` if you want to omit project names f
 
 Example output:
 
-```
+```plaintext
 Checking Environment ...
 
 Git configured for git user? ... yes
@@ -129,18 +129,18 @@ In some case it is necessary to rebuild the `authorized_keys` file.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:shell:setup
 ```
 
 **Source Installation**
 
-```
+```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake gitlab:shell:setup RAILS_ENV=production
 ```
 
-```
+```plaintext
 This will rebuild an authorized_keys file.
 You will lose any data stored in authorized_keys file.
 Do you want to continue (yes/no)? yes
@@ -153,13 +153,13 @@ clear Redis' cache.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake cache:clear
 ```
 
 **Source Installation**
 
-```
+```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
 ```
@@ -174,7 +174,7 @@ Omnibus packages.
 
 **Source Installation**
 
-```
+```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production
 ```
@@ -194,13 +194,13 @@ in the GitLab Performance Monitoring database.
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:track_deployment
 ```
 
 **Source Installation**
 
-```
+```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake gitlab:track_deployment RAILS_ENV=production
 ```
@@ -213,13 +213,13 @@ is included to help you with this:
 
 **Omnibus Installation**
 
-```
+```bash
 sudo gitlab-rake gitlab:tcp_check[example.com,80]
 ```
 
 **Source Installation**
 
-```
+```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake gitlab:tcp_check[example.com,80] RAILS_ENV=production
 ```
@@ -279,6 +279,6 @@ This could be as a result of [updating existing metrics](../../development/prome
 
 To re-import the metrics you can run:
 
-```sh
+```bash
 sudo gitlab-rake metrics:setup_common_metrics
 ```