Add latest changes from gitlab-org/gitlab@master

27 files changed, 105 insertions, 89 deletions

diff --git a/doc/.linting/vale/styles/gitlab/FirstPerson.yml b/doc/.linting/vale/styles/gitlab/FirstPerson.yml
new file mode 100644
index 00000000000..18c5265b0a6
--- /dev/null
+++ b/doc/.linting/vale/styles/gitlab/FirstPerson.yml
@@ -0,0 +1,13 @@
+# Checks for use of first person pronouns.
+#
+# For a list of all options, see https://errata-ai.github.io/vale/styles/
+extends: existence
+message: '`%s` is a first-person pronoun. Use second- or third-person pronouns (like we, you, us, one) instead.'
+level: warning
+ignorecase: true
+link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
+tokens:
+  - '\bI[ ,;:?!"]|\bI\x27.{1,2}'
+  - me
+  - myself
+  - mine
diff --git a/doc/.linting/vale/styles/gitlab/Substitutions.yml b/doc/.linting/vale/styles/gitlab/Substitutions.yml
index 1ddd2f8bf4e..e5277c7091b 100644
--- a/doc/.linting/vale/styles/gitlab/Substitutions.yml
+++ b/doc/.linting/vale/styles/gitlab/Substitutions.yml
@@ -1,9 +1,9 @@
 ---
-# Checks for use of top misused terms at GitLab.
+# Checks for use of some of the top misused terms at GitLab.
 #
 # For a list of all options, see https://errata-ai.github.io/vale/styles/
 extends: substitution
-message: Use "%s" instead of "%s."
+message: Use `%s` instead of `%s`.
 link: https://about.gitlab.com/handbook/communication/#top-misused-terms
 level: warning
 nonword: true
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 90632a2faa0..02fb260d010 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -32,8 +32,8 @@ Example response:
     "id": "ed899a2f4b50b4370feeea94676502b42383c746",
     "short_id": "ed899a2f4b5",
     "title": "Replace sanitize with escape once",
-    "author_name": "Dmitriy Zaporozhets",
-    "author_email": "dzaporozhets@sphereconsultinginc.com",
+    "author_name": "Example User",
+    "author_email": "user@example.com",
     "authored_date": "2012-09-20T11:50:22+03:00",
     "committer_name": "Administrator",
     "committer_email": "admin@example.com",
@@ -50,9 +50,9 @@ Example response:
     "short_id": "6104942438c",
     "title": "Sanitize for network graph",
     "author_name": "randx",
-    "author_email": "dmitriy.zaporozhets@gmail.com",
-    "committer_name": "Dmitriy",
-    "committer_email": "dmitriy.zaporozhets@gmail.com",
+    "author_email": "user@example.com",
+    "committer_name": "ExampleName",
+    "committer_email": "user@example.com",
     "created_at": "2012-09-20T09:06:12+03:00",
     "message": "Sanitize for network graph",
     "parent_ids": [
@@ -142,10 +142,10 @@ Example response:
   "id": "ed899a2f4b50b4370feeea94676502b42383c746",
   "short_id": "ed899a2f4b5",
   "title": "some commit message",
-  "author_name": "Dmitriy Zaporozhets",
-  "author_email": "dzaporozhets@sphereconsultinginc.com",
-  "committer_name": "Dmitriy Zaporozhets",
-  "committer_email": "dzaporozhets@sphereconsultinginc.com",
+  "author_name": "Example User",
+  "author_email": "user@example.com",
+  "committer_name": "Example User",
+  "committer_email": "user@example.com",
   "created_at": "2016-09-20T09:26:24.000-07:00",
   "message": "some commit message",
   "parent_ids": [
@@ -217,9 +217,9 @@ Example response:
   "short_id": "6104942438c",
   "title": "Sanitize for network graph",
   "author_name": "randx",
-  "author_email": "dmitriy.zaporozhets@gmail.com",
+  "author_email": "user@example.com",
   "committer_name": "Dmitriy",
-  "committer_email": "dmitriy.zaporozhets@gmail.com",
+  "committer_email": "user@example.com",
   "created_at": "2012-09-20T09:06:12+03:00",
   "message": "Sanitize for network graph",
   "committed_date": "2012-09-20T09:06:12+03:00",
@@ -307,15 +307,15 @@ Example response:
   "id": "8b090c1b79a14f2bd9e8a738f717824ff53aebad",
   "short_id": "8b090c1b",
   "title": "Feature added",
-  "author_name": "Dmitriy Zaporozhets",
-  "author_email": "dmitriy.zaporozhets@gmail.com",
+  "author_name": "Example User",
+  "author_email": "user@example.com",
   "authored_date": "2016-12-12T20:10:39.000+01:00",
   "created_at": "2016-12-12T20:10:39.000+01:00",
   "committer_name": "Administrator",
   "committer_email": "admin@example.com",
   "committed_date": "2016-12-12T20:10:39.000+01:00",
   "title": "Feature added",
-  "message": "Feature added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+  "message": "Feature added\n\nSigned-off-by: Example User <user@example.com>\n",
   "parent_ids": [
     "a738f717824ff53aebad8b090c1b79a14f2bd9e8"
   ],
diff --git a/doc/api/merge_request_context_commits.md b/doc/api/merge_request_context_commits.md
index 58847dc20ae..260be467a06 100644
--- a/doc/api/merge_request_context_commits.md
+++ b/doc/api/merge_request_context_commits.md
@@ -22,11 +22,11 @@ Parameters:
         "parent_ids": null,
         "title": "Update README.md to include `Usage in testing and development`",
         "message": "Update README.md to include `Usage in testing and development`",
-        "author_name": "Luke \"Jared\" Bennett",
-        "author_email": "lbennett@gitlab.com",
+        "author_name": "Example \"Sample\" User",
+        "author_email": "user@example.com",
         "authored_date": "2017-04-11T10:08:59.000Z",
-        "committer_name": "Luke \"Jared\" Bennett",
-        "committer_email": "lbennett@gitlab.com",
+        "committer_name": "Example \"Sample\" User",
+        "committer_email": "user@example.com",
         "committed_date": "2017-04-11T10:08:59.000Z"
     }
 ]
@@ -57,16 +57,16 @@ POST /projects/:id/merge_requests/
 [
     {
         "id": "6d394385cf567f80a8fd85055db1ab4c5295806f",
-        "message": "Added contributing guide\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+        "message": "Added contributing guide\n\nSigned-off-by: Example User <user@example.com>\n",
         "parent_ids": [
             "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"
         ],
         "authored_date": "2014-02-27T10:05:10.000+02:00",
-        "author_name": "Dmitriy Zaporozhets",
-        "author_email": "dmitriy.zaporozhets@gmail.com",
+        "author_name": "Example User",
+        "author_email": "user@example.com",
         "committed_date": "2014-02-27T10:05:10.000+02:00",
-        "committer_name": "Dmitriy Zaporozhets",
-        "committer_email": "dmitriy.zaporozhets@gmail.com"
+        "committer_name": "Example User",
+        "committer_email": "user@example.com"
     }
 ]
 ```
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 75cb0e7f49b..bda4f05d23d 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -732,8 +732,8 @@ Parameters:
     "id": "ed899a2f4b50b4370feeea94676502b42383c746",
     "short_id": "ed899a2f4b5",
     "title": "Replace sanitize with escape once",
-    "author_name": "Dmitriy Zaporozhets",
-    "author_email": "dzaporozhets@sphereconsultinginc.com",
+    "author_name": "Example User",
+    "author_email": "user@example.com",
     "created_at": "2012-09-20T11:50:22+03:00",
     "message": "Replace sanitize with escape once"
   },
@@ -741,8 +741,8 @@ Parameters:
     "id": "6104942438c14ec7bd21c6cd5bd995272b3faff6",
     "short_id": "6104942438c",
     "title": "Sanitize for network graph",
-    "author_name": "randx",
-    "author_email": "dmitriy.zaporozhets@gmail.com",
+    "author_name": "Example User",
+    "author_email": "user@example.com",
     "created_at": "2012-09-20T09:06:12+03:00",
     "message": "Sanitize for network graph"
   }
diff --git a/doc/api/repositories.md b/doc/api/repositories.md
index 35762e3150f..f261c9ab9f7 100644
--- a/doc/api/repositories.md
+++ b/doc/api/repositories.md
@@ -154,16 +154,16 @@ Response:
     "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
     "short_id": "12d65c8dd2b",
     "title": "JS fix",
-    "author_name": "Dmitriy Zaporozhets",
-    "author_email": "dmitriy.zaporozhets@gmail.com",
+    "author_name": "Example User",
+    "author_email": "user@example.com",
     "created_at": "2014-02-27T10:27:00+02:00"
   },
   "commits": [{
     "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
     "short_id": "12d65c8dd2b",
     "title": "JS fix",
-    "author_name": "Dmitriy Zaporozhets",
-    "author_email": "dmitriy.zaporozhets@gmail.com",
+    "author_name": "Example User",
+    "author_email": "user@example.com",
     "created_at": "2014-02-27T10:27:00+02:00"
   }],
   "diffs": [{
@@ -241,11 +241,11 @@ Example response:
   "created_at": "2014-02-27T08:03:18.000Z",
   "parent_ids": [],
   "message": "Initial commit\n",
-  "author_name": "Dmitriy Zaporozhets",
-  "author_email": "dmitriy.zaporozhets@gmail.com",
+  "author_name": "Example User",
+  "author_email": "user@example.com",
   "authored_date": "2014-02-27T08:03:18.000Z",
-  "committer_name": "Dmitriy Zaporozhets",
-  "committer_email": "dmitriy.zaporozhets@gmail.com",
+  "committer_name": "Example User",
+  "committer_email": "user@example.com",
   "committed_date": "2014-02-27T08:03:18.000Z"
 }
 ```
diff --git a/doc/integration/jira_development_panel.md b/doc/integration/jira_development_panel.md
index 05a83e0987a..754c4a4148c 100644
--- a/doc/integration/jira_development_panel.md
+++ b/doc/integration/jira_development_panel.md
@@ -4,8 +4,10 @@
 
 Complementary to our [existing Jira][existing-jira] project integration, you're now able to integrate
 GitLab projects with [Jira Development Panel][jira-development-panel]. Both can be used
-simultaneously. This works with self-hosted GitLab or GitLab.com integrated with self-hosted Jira
-or cloud Jira.
+simultaneously. This works with self-managed GitLab or GitLab.com integrated with:
+
+- Jira hosted by you.
+- Cloud Jira.
 
 By doing this you can easily access related GitLab merge requests, branches, and commits directly from a Jira issue.
 
@@ -19,7 +21,7 @@ Note this is different from the [existing Jira][existing-jira] project integrati
 is one GitLab project to the entire Jira instance.
 
 We recommend that a GitLab group admin
-or instance admin (in the case of self-hosted GitLab) set up the integration,
+or instance admin (in the case of self-managed GitLab) set up the integration,
 in order to simplify administration.
 
 TIP: **Tip:**
@@ -28,9 +30,9 @@ regular users won't impact your integration.
 
 ## Requirements
 
-### Self-hosted GitLab
+### Self-managed GitLab
 
-If you are using self-hosted GitLab, make sure your GitLab instance is accessible by Jira.
+If you are using self-managed GitLab, make sure your GitLab instance is accessible by Jira.
 
 - If you are connecting to Jira Cloud, make sure your instance is accessible via the internet.
 - If you are using Jira Server, make sure your instance is accessible however your network is set up.
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index ae818f285b8..da384fa9528 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -46,13 +46,13 @@ sudo -u git -H bin/rails console RAILS_ENV=production
 
 Then run the following command to enable the feature flag:
 
-```
+```ruby
 Feature.enable(:sourcegraph)
 ```
 
 You can also enable the feature flag only for specific projects with:
 
-```
+```ruby
 Feature.enable(:sourcegraph, Project.find_by_full_path('my_group/my_project'))
 ```
 
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index cf6492d7372..8056c672d67 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -64,7 +64,7 @@ To enable the Twitter OmniAuth provider you must register your application with
 
    For installations from source:
 
-   ```
+   ```yaml
      - { name: 'twitter', app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET' }
    ```
diff --git a/doc/integration/ultra_auth.md b/doc/integration/ultra_auth.md
index 091887d8eb8..3188213dac9 100644
--- a/doc/integration/ultra_auth.md
+++ b/doc/integration/ultra_auth.md
@@ -60,7 +60,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
 
    For installation from source:
 
-   ```
+   ```yaml
    - { name: 'ultraauth',
        app_id: 'OPENID_CLIENT_ID',
        app_secret: 'OPENID_CLIENT_SECRET',
diff --git a/doc/integration/vault.md b/doc/integration/vault.md
index 2afa1ba7e32..b3e77ce440d 100644
--- a/doc/integration/vault.md
+++ b/doc/integration/vault.md
@@ -36,7 +36,7 @@ The following assumes you already have Vault installed and running.
 
     You should see the following output in the terminal:
 
-    ```shell
+    ```plaintext
     Success! Enabled oidc auth method at: oidc/
     ```
 
@@ -113,7 +113,7 @@ The following assumes you already have Vault installed and running.
 
     The terminal will output:
 
-    ```
+    ```plaintext
     Success! You are now authenticated. The token information displayed below
     is already stored in the token helper. You do NOT need to run "vault login"
     again. Future Vault requests will automatically use this token.
diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index c6c9389b924..09d919d0120 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -98,7 +98,7 @@ To support importing bare repositories from hashed storage, GitLab 10.4 and
 later stores the full project path with each repository, in a special section of
 the Git repository's config file. This section is formatted as follows:
 
-```
+```ini
 [gitlab]
   fullpath = gitlab-org/gitlab
 ```
@@ -128,7 +128,7 @@ Until then, you may wish to manually migrate repositories yourself. You can use
 [Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session)
 to do so. In a Rails console session, run the following to migrate a project:
 
-```
+```ruby
 project = Project.find_by_full_path('gitlab-org/gitlab')
 project.write_repository_config
 ```
@@ -136,7 +136,7 @@ project.write_repository_config
 In a Rails console session, run the following to migrate all of a namespace's
 projects (this may take a while if there are 1000s of projects in a namespace):
 
-```
+```ruby
 namespace = Namespace.find_by_full_path('gitlab-org')
 namespace.send(:write_projects_repository_config)
 ```
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md
index ccab1a2267c..5ca8c0687f4 100644
--- a/doc/system_hooks/system_hooks.md
+++ b/doc/system_hooks/system_hooks.md
@@ -446,8 +446,8 @@ X-Gitlab-Event: System Hook
       "timestamp": "2013-05-13T18:18:08+00:00",
       "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
       "author": {
-        "name": "Dmitriy Zaporozhets",
-        "email": "dmitriy.zaporozhets@gmail.com"
+        "name": "Example User",
+        "email": "user@example.com"
       }
     }
   ],
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index af33936297c..4958768f772 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -40,7 +40,7 @@ If you are using GitLab.com, see the [quick start guide](quick_start_guide.md)
 for how to use Auto DevOps with GitLab.com and a Kubernetes cluster on Google Kubernetes
 Engine (GKE).
 
-If you are using a self-hosted instance of GitLab, you will need to configure the
+If you are using a self-managed instance of GitLab, you will need to configure the
 [Google OAuth2 OmniAuth Provider](../../integration/google.md) before
 you can configure a cluster on GKE. Once this is set up, you can follow the steps on the
 [quick start guide](quick_start_guide.md) to get started.
@@ -55,7 +55,7 @@ in multiple ways:
 - Auto DevOps works with any Kubernetes cluster; you're not limited to running
   on GitLab's infrastructure. (Note that many features also work without Kubernetes).
 - There is no additional cost (no markup on the infrastructure costs), and you
-  can use a self-hosted Kubernetes cluster or Containers as a Service on any
+  can use a Kubernetes cluster you host or Containers as a Service on any
   public cloud (for example, [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/)).
 - Auto DevOps has more features including security testing, performance testing,
   and code quality testing.
@@ -93,7 +93,8 @@ knowledge of the following:
 Auto DevOps provides great defaults for all the stages; you can, however,
 [customize](#customizing) almost everything to your needs.
 
-For an overview on the creation of Auto DevOps, read the blog post [From 2/3 of the Self-Hosted Git Market, to the Next-Generation CI System, to Auto DevOps](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/).
+For an overview on the creation of Auto DevOps, read more
+[in this blog post](https://about.gitlab.com/blog/2017/06/29/whats-next-for-gitlab-ci/).
 
 NOTE: **Note**
 Kubernetes clusters can [be used without](../../user/project/clusters/index.md)
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 32dcd60624f..d5730d16296 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -7,7 +7,7 @@ We will use GitLab's native Kubernetes integration, so you will not need
 to create a Kubernetes cluster manually using the Google Cloud Platform console.
 We will create and deploy a simple application that we create from a GitLab template.
 
-These instructions will also work for a self-hosted GitLab instance; you'll just
+These instructions will also work for a self-managed GitLab instance; you'll just
 need to ensure your own [Runners are configured](../../ci/runners/README.md) and
 [Google OAuth is enabled](../../integration/google.md).
 
diff --git a/doc/topics/web_application_firewall/index.md b/doc/topics/web_application_firewall/index.md
index 6c847f12bba..27cf60d5662 100644
--- a/doc/topics/web_application_firewall/index.md
+++ b/doc/topics/web_application_firewall/index.md
@@ -49,7 +49,7 @@ The Web Application Firewall requires:
 If you are using GitLab.com, see the [quick start guide](quick_start_guide.md) for
 how to use the WAF with GitLab.com and a Kubernetes cluster on Google Kubernetes Engine (GKE).
 
-If you are using a self-hosted instance of GitLab, you need to configure the
+If you are using a self-managed instance of GitLab, you need to configure the
 [Google OAuth2 OmniAuth Provider](../../integration/google.md) before
 you can configure a cluster on GKE. Once this is set up, you can follow the steps on the [quick start guide](quick_start_guide.md) to get started.
 
diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md
index 96c2da4e963..5942a5ac996 100644
--- a/doc/topics/web_application_firewall/quick_start_guide.md
+++ b/doc/topics/web_application_firewall/quick_start_guide.md
@@ -7,7 +7,7 @@ We will use GitLab's native Kubernetes integration, so you will not need
 to create a Kubernetes cluster manually using the Google Cloud Platform console.
 We will create and deploy a simple application that we create from a GitLab template.
 
-These instructions will also work for a self-hosted GitLab instance. However, you will
+These instructions will also work for a self-managed GitLab instance. However, you will
 need to ensure your own [Runners are configured](../../ci/runners/README.md) and
 [Google OAuth is enabled](../../integration/google.md).
 
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
index 374502018c4..876fb67ea73 100644
--- a/doc/user/admin_area/appearance.md
+++ b/doc/user/admin_area/appearance.md
@@ -5,7 +5,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/customization/branded_login_page.
 
 # GitLab Appearance **(CORE ONLY)**
 
-There are several options for customizing the appearance of a self hosted instance
+There are several options for customizing the appearance of a self-managed instance
 of GitLab. These settings are accessed from the **Admin Area** in the **Appearance**
 section.
 
diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md
index 8e06153ccb2..f4e2b71dd3c 100644
--- a/doc/user/packages/maven_repository/index.md
+++ b/doc/user/packages/maven_repository/index.md
@@ -207,7 +207,7 @@ The `id` must be the same with what you
 Replace `PROJECT_ID` with your project ID which can be found on the home page
 of your project.
 
-If you have a self-hosted GitLab installation, replace `gitlab.com` with your
+If you have a self-managed GitLab installation, replace `gitlab.com` with your
 domain name.
 
 NOTE: **Note:**
@@ -260,7 +260,7 @@ The `id` must be the same with what you
 Replace `my-group` with your group name and `PROJECT_ID` with your project ID
 which can be found on the home page of your project.
 
-If you have a self-hosted GitLab installation, replace `gitlab.com` with your
+If you have a self-managed GitLab installation, replace `gitlab.com` with your
 domain name.
 
 NOTE: **Note:**
@@ -315,7 +315,7 @@ The `id` must be the same with what you
 Replace `PROJECT_ID` with your project ID which can be found on the home page
 of your project.
 
-If you have a self-hosted GitLab installation, replace `gitlab.com` with your
+If you have a self-managed GitLab installation, replace `gitlab.com` with your
 domain name.
 
 NOTE: **Note:**
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index af848358a4d..6c531dfe369 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -127,7 +127,7 @@ npm config set '//gitlab.com/api/v4/packages/npm/:_authToken' "<your_token>"
 Replace `<your_project_id>` with your project ID which can be found on the home page
 of your project and `<your_token>` with your personal access token.
 
-If you have a self-hosted GitLab installation, replace `gitlab.com` with your
+If you have a self-managed GitLab installation, replace `gitlab.com` with your
 domain name.
 
 You should now be able to download and upload NPM packages to your project.
@@ -185,7 +185,7 @@ for NPM. To do this, add the following section to the bottom of `package.json`:
 Replace `<your_project_id>` with your project ID, which can be found on the home
 page of your project, and replace `@foo` with your own scope.
 
-If you have a self-hosted GitLab installation, replace `gitlab.com` with your
+If you have a self-managed GitLab installation, replace `gitlab.com` with your
 domain name.
 
 Once you have enabled it and set up [authentication](#authenticating-to-the-gitlab-npm-registry),
diff --git a/doc/user/packages/nuget_repository/index.md b/doc/user/packages/nuget_repository/index.md
index dd614c2b38e..fdc4c6894b9 100644
--- a/doc/user/packages/nuget_repository/index.md
+++ b/doc/user/packages/nuget_repository/index.md
@@ -94,7 +94,7 @@ nuget source Add -Name "GitLab" -Source "https//gitlab.example/api/v4/projects/1
    - **Name**: Desired name for the source
    - **Location**: `https://gitlab.com/api/v4/projects/<your_project_id>/packages/nuget/index.json`
      - Replace `<your_project_id>` with your project ID.
-     - If you have a self-hosted GitLab installation, replace `gitlab.com` with your domain name.
+     - If you have a self-managed GitLab installation, replace `gitlab.com` with your domain name.
    - **Username**: Your GitLab username
    - **Password**: Your personal access token
 
@@ -104,7 +104,7 @@ nuget source Add -Name "GitLab" -Source "https//gitlab.example/api/v4/projects/1
 
    ![Visual Studio NuGet source added](img/visual_studio_nuget_source_added.png)
 
-In case of any warning, please make sure that the **Location**, **Username** and **Password** are correct.
+In case of any warning, please make sure that the **Location**, **Username**, and **Password** are correct.
 
 ### Add NuGet Repository source with .NET CLI
 
diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md
index 20614bf5cc5..b8ba5e89949 100644
--- a/doc/user/project/import/gemnasium.md
+++ b/doc/user/project/import/gemnasium.md
@@ -44,7 +44,7 @@ some steps to migrate your projects. There is no automatic import since GitLab
 doesn't know anything about any projects which existed on Gemnasium.com.
 Security features are free for public (open-source) projects hosted on GitLab.com.
 
-### If your project is hosted on GitLab (`https://gitlab.com` / self-hosted)
+### If your project is hosted on GitLab (`https://gitlab.com` / self-managed)
 
 You're almost set! If you're already using
 [Auto DevOps](../../../topics/autodevops/), you are already covered.
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index a475dde59fd..80b14c40e0a 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -1,19 +1,19 @@
 # Import your project from GitHub to GitLab
 
 Using the importer, you can import your GitHub repositories to GitLab.com or to
-your self-hosted GitLab instance.
+your self-managed GitLab instance.
 
 ## Overview
 
 NOTE: **Note:**
 These instructions work for users on GitLab.com, but if you are an
-administrator of a self-hosted GitLab instance or if you are importing from GitHub Enterprise,
+administrator of a self-managed GitLab instance or if you are importing from GitHub Enterprise,
 you must enable [GitHub integration][gh-import]. GitHub integration is the only method for
 importing from GitHub Enterprise. If you are using GitLab.com, you can alternatively import
 GitHub repositories using a [personal access token](#using-a-github-token),
 but this method is not recommended because it cannot associate all user activity
 (such as issues and pull requests) with matching GitLab users.
-If you are an administrator of a self-hosted GitLab instance, you can also use the
+If you are an administrator of a self-managed GitLab instance, you can also use the
 [GitHub rake task](../../../administration/raketasks/github_import.md) to import projects from
 GitHub without the constraints of a Sidekiq worker.
 
@@ -80,7 +80,7 @@ User-matching attempts occur in that order, and if a user is not identified eith
 the user account that is performing the import.
 
 NOTE: **Note:**
-If you are using a self-hosted GitLab instance or if you are importing from GitHub Enterprise, this process requires that you have configured
+If you are using a self-managed GitLab instance or if you are importing from GitHub Enterprise, this process requires that you have configured
 [GitHub integration][gh-import].
 
 1. From the top navigation bar, click **+** and select **New project**.
@@ -95,7 +95,7 @@ NOTE: **Note:**
 Using a personal access token to import projects is not recommended. If you are a GitLab.com user,
 you can use a personal access token to import your project from GitHub, but this method cannot
 associate all user activity (such as issues and pull requests) with matching GitLab users.
-If you are an administrator of a self-hosted GitLab instance or if you are importing from
+If you are an administrator of a self-managed GitLab instance or if you are importing from
 GitHub Enterprise, you cannot use a personal access token.
 The [GitHub integration method (above)](#using-the-github-integration) is recommended for all users.
 Read more in the [How it works](#how-it-works) section.
@@ -137,7 +137,7 @@ Additionally, you can configure GitLab to send pipeline status updates back GitH
 If you import your project using [CI/CD for external repo](../../../ci/ci_cd_for_external_repos/index.md), then both
 of the above are automatically configured. **(PREMIUM)**
 
-## Improving the speed of imports on self-hosted instances
+## Improving the speed of imports on self-managed instances
 
 NOTE: **Note:**
 Admin access to the GitLab server is required.
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index ab2f942e911..a4c844b415d 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -22,20 +22,20 @@ repository is too large the import can timeout.
 
 There is also the option of [connecting your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)**
 
-## Migrating from self-hosted GitLab to GitLab.com
+## Migrating from self-managed GitLab to GitLab.com
 
 If you only need to migrate Git repos, you can [import each project by URL](repo_by_url.md). Issues and merge requests can't be imported.
 
 If you want to retain all metadata like issues and merge requests, you can use
-the [import/export feature](../settings/import_export.md) to export projects from self-hosted GitLab and import those projects into GitLab.com.
+the [import/export feature](../settings/import_export.md) to export projects from self-managed GitLab and import those projects into GitLab.com.
 
 NOTE: **Note:**
-This approach assumes all users from the self-hosted instance have already been migrated.
+This approach assumes all users from the self-managed instance have already been migrated.
 If the users haven't been migrated yet, the user conducting the import
 will take the place of all references to the missing user(s).
 
-If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-hosted to GitLab.com.
-The order of assets to migrate from a self-hosted instance to GitLab is the following:
+If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-managed to GitLab.com.
+The order of assets to migrate from a self-managed instance to GitLab.com is the following:
 
 1. [Users](../../../api/users.md)
 1. [Groups](../../../api/groups.md)
@@ -47,7 +47,7 @@ Keep in mind the limitations of the [import/export feature](../settings/import_e
 You will still need to migrate your Container Registry over a series of
 Docker pulls and pushes and re-run any CI pipelines to retrieve any build artifacts.
 
-## Migrating between two self-hosted GitLab instances
+## Migrating between two self-managed GitLab instances
 
 The best method for migrating from one GitLab instance to another,
 perhaps from an old server to a new server for example, is to
@@ -55,4 +55,4 @@ perhaps from an old server to a new server for example, is to
 then restore it on the new server.
 
 In the event of merging two GitLab instances together (for example, both instances have existing data on them and one can't be wiped),
-refer to the instructions in [Migrating from self-hosted GitLab to GitLab.com](#migrating-from-self-hosted-gitlab-to-gitlabcom).
+refer to the instructions in [Migrating from self-managed GitLab to GitLab.com](#migrating-from-self-managed-gitlab-to-gitlabcom).
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index 794a68f6b8f..9423929d72f 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -458,12 +458,12 @@ X-Gitlab-Event: Note Hook
   },
   "commit": {
     "id": "cfe32cf61b73a0d5e9f13e774abde7ff789b1660",
-    "message": "Add submodule\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+    "message": "Add submodule\n\nSigned-off-by: Example User \u003cuser@example.com.com\u003e\n",
     "timestamp": "2014-02-27T10:06:20+02:00",
     "url": "http://example.com/gitlab-org/gitlab-test/commit/cfe32cf61b73a0d5e9f13e774abde7ff789b1660",
     "author": {
-      "name": "Dmitriy Zaporozhets",
-      "email": "dmitriy.zaporozhets@gmail.com"
+      "name": "Example User",
+      "email": "user@example.com"
     }
   }
 }
diff --git a/package.json b/package.json
index 67cd46cbbac..adb86e11545 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@babel/preset-env": "^7.8.4",
     "@gitlab/at.js": "^1.5.5",
     "@gitlab/svgs": "^1.105.0",
-    "@gitlab/ui": "^9.20.0",
+    "@gitlab/ui": "^9.21.1",
     "@gitlab/visual-review-tools": "1.5.1",
     "@sentry/browser": "^5.10.2",
     "@sourcegraph/code-host-integration": "0.0.30",
diff --git a/yarn.lock b/yarn.lock
index af76917f88d..7b65266462a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -801,10 +801,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.105.0.tgz#9686f8696594a5f22de11af2b81fdcceb715f4f2"
   integrity sha512-2wzZXe2b7DnGyL7FTbPq0dSpk+gjkq4SBTNtMrqdwX2qaM+XJB50XaMm17kdY5V1bBkMgbc7JJ2vgbLxhS/CkQ==
 
-"@gitlab/ui@^9.20.0":
-  version "9.20.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.20.0.tgz#69d8d345408a727cfe7ebde3554c78c58f9065b2"
-  integrity sha512-ZWMpvK2Zd2xwQ9svvjzSSD3jI3NnE5izc/bR6kbzXoAe+KdUzLeHDih1ePwhU87BCJeS8JrhJhXT8xnYv/dICg==
+"@gitlab/ui@^9.21.1":
+  version "9.21.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.21.1.tgz#76da9b86de959c2757a0c0a9389970f8d5afcc47"
+  integrity sha512-nJi2lFYq3WFXDNlH5vAg1Mb3Tf/PKnaVIm5W07I+hIWj/GALnwZHO3WHJuhwWIUTZOtLz7egIr4Wyh3EqBk+cg==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"