From 91ef4dcc05931e8be5cfb28462656386ed1fca21 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 2 Oct 2020 06:08:27 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/service_desk_root.vue          |  12 +-
 .../components/service_desk_setting.vue       |  56 ++--
 .../related_issues/components/issue_token.vue |   2 +
 .../mixins/related_issuable_mixin.js          |   2 +-
 app/models/postgresql/replication_slot.rb     |   4 +-
 .../projects/issues/_discussion.html.haml     |   1 +
 .../replication_and_failover_external.md      |  12 +-
 doc/administration/redis/troubleshooting.md   |   6 +-
 doc/gitlab-geo/after_setup.md                 |   5 -
 doc/gitlab-geo/bring-primary-back.md          |   5 -
 doc/gitlab-geo/configuration.md               |   5 -
 doc/gitlab-geo/configuration_source.md        |   5 -
 doc/gitlab-geo/database.md                    |   5 -
 doc/gitlab-geo/database_source.md             |   5 -
 doc/gitlab-geo/disaster-recovery.md           |   5 -
 doc/gitlab-geo/docker_registry.md             |   5 -
 doc/gitlab-geo/faq.md                         |   5 -
 doc/gitlab-geo/ha.md                          |   5 -
 doc/gitlab-geo/object_storage.md              |   5 -
 doc/gitlab-geo/planned-failover.md            |   5 -
 doc/gitlab-geo/security-review.md             |   5 -
 doc/gitlab-geo/ssh.md                         |   5 -
 doc/gitlab-geo/troubleshooting.md             |   5 -
 doc/gitlab-geo/tuning.md                      |   5 -
 doc/gitlab-geo/updating_the_geo_nodes.md      |   5 -
 doc/gitlab-geo/using_a_geo_server.md          |   5 -
 doc/integration/cas.md                        |   8 +-
 doc/integration/facebook.md                   |   2 +-
 doc/integration/github.md                     |  24 +-
 doc/integration/gitlab.md                     |   7 +-
 doc/integration/google.md                     |   7 +-
 doc/integration/kerberos.md                   |   3 +-
 doc/integration/omniauth.md                   |  26 +-
 doc/integration/salesforce.md                 |   2 +-
 doc/integration/saml.md                       |  76 ++---
 doc/integration/twitter.md                    |   3 +-
 doc/operations/metrics/alerts.md              |   3 +-
 .../metrics/dashboards/panel_types.md         |   2 +-
 doc/topics/autodevops/index.md                |   2 +-
 doc/user/clusters/agent/index.md              |  34 +--
 .../project/clusters/add_remove_clusters.md   |   2 +-
 doc/user/project/clusters/serverless/aws.md   |   7 +-
 lib/gitlab/database.rb                        |  26 --
 locale/gitlab.pot                             |   9 +-
 .../components/add_issuable_form_spec.js      |   5 +-
 .../components/issue_token_spec.js            | 265 ++++++------------
 .../components/related_issues_block_spec.js   |   5 +-
 .../components/related_issues_list_spec.js    |   5 +-
 .../components/service_desk_root_spec.js      |   4 +-
 spec/lib/gitlab/database_spec.rb              |  81 ------
 50 files changed, 268 insertions(+), 525 deletions(-)
 delete mode 100644 doc/gitlab-geo/after_setup.md
 delete mode 100644 doc/gitlab-geo/bring-primary-back.md
 delete mode 100644 doc/gitlab-geo/configuration.md
 delete mode 100644 doc/gitlab-geo/configuration_source.md
 delete mode 100644 doc/gitlab-geo/database.md
 delete mode 100644 doc/gitlab-geo/database_source.md
 delete mode 100644 doc/gitlab-geo/disaster-recovery.md
 delete mode 100644 doc/gitlab-geo/docker_registry.md
 delete mode 100644 doc/gitlab-geo/faq.md
 delete mode 100644 doc/gitlab-geo/ha.md
 delete mode 100644 doc/gitlab-geo/object_storage.md
 delete mode 100644 doc/gitlab-geo/planned-failover.md
 delete mode 100644 doc/gitlab-geo/security-review.md
 delete mode 100644 doc/gitlab-geo/ssh.md
 delete mode 100644 doc/gitlab-geo/troubleshooting.md
 delete mode 100644 doc/gitlab-geo/tuning.md
 delete mode 100644 doc/gitlab-geo/updating_the_geo_nodes.md
 delete mode 100644 doc/gitlab-geo/using_a_geo_server.md

diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index 81367f7d6b4..4bfed6d489d 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlAlert } from '@gitlab/ui';
-import { __ } from '~/locale';
+import { __, sprintf } from '~/locale';
 import ServiceDeskSetting from './service_desk_setting.vue';
 import ServiceDeskService from '../services/service_desk_service';
 import eventHub from '../event_hub';
@@ -122,11 +122,13 @@ export default {
           this.incomingEmail = data?.service_desk_address;
           this.showAlert(__('Changes were successfully made.'), 'success');
         })
-        .catch(() =>
+        .catch(err => {
           this.showAlert(
-            __('An error occurred while saving the template. Please check if the template exists.'),
-          ),
-        )
+            sprintf(__('An error occured while making the changes: %{error}'), {
+              error: err?.response?.data?.message,
+            }),
+          );
+        })
         .finally(() => {
           this.isTemplateSaving = false;
         });
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 1bcc4d7f269..00e5848522e 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlFormSelect, GlToggle, GlLoadingIcon } from '@gitlab/ui';
+import { GlButton, GlFormSelect, GlToggle, GlLoadingIcon, GlSprintf } from '@gitlab/ui';
 import { __ } from '~/locale';
 import tooltip from '~/vue_shared/directives/tooltip';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -17,6 +17,7 @@ export default {
     GlFormSelect,
     GlToggle,
     GlLoadingIcon,
+    GlSprintf,
   },
   mixins: [glFeatureFlagsMixin()],
   props: {
@@ -60,6 +61,7 @@ export default {
       selectedTemplate: this.initialSelectedTemplate,
       outgoingName: this.initialOutgoingName || __('GitLab Support Bot'),
       projectKey: this.initialProjectKey,
+      baseEmail: this.incomingEmail.replace(this.initialProjectKey, ''),
     };
   },
   computed: {
@@ -123,12 +125,33 @@ export default {
               />
             </div>
           </div>
+          <span v-if="projectKey" class="form-text text-muted">
+            <gl-sprintf :message="__('Emails sent to %{email} will still be supported')">
+              <template #email>
+                <code>{{ baseEmail }}</code>
+              </template>
+            </gl-sprintf>
+          </span>
         </template>
         <template v-else>
           <gl-loading-icon :inline="true" />
           <span class="sr-only">{{ __('Fetching incoming email') }}</span>
         </template>
 
+        <template v-if="hasProjectKeySupport">
+          <label for="service-desk-project-suffix" class="mt-3">
+            {{ __('Project name suffix') }}
+          </label>
+          <input id="service-desk-project-suffix" v-model.trim="projectKey" class="form-control" />
+          <span class="form-text text-muted">
+            {{
+              __(
+                'Project name suffix is a user-defined string which will be appended to the project path, and will form the Service Desk email address.',
+              )
+            }}
+          </span>
+        </template>
+
         <label for="service-desk-template-select" class="mt-3">
           {{ __('Template to append to all Service Desk issues') }}
         </label>
@@ -144,27 +167,16 @@ export default {
         <span class="form-text text-muted">
           {{ __('Emails sent from Service Desk will have this name') }}
         </span>
-        <template v-if="hasProjectKeySupport">
-          <label for="service-desk-project-suffix" class="mt-3">
-            {{ __('Project name suffix') }}
-          </label>
-          <input id="service-desk-project-suffix" v-model.trim="projectKey" class="form-control" />
-          <span class="form-text text-muted mb-3">
-            {{
-              __(
-                'Project name suffix is a user-defined string which will be appended to the project path, and will form the Service Desk email address.',
-              )
-            }}
-          </span>
-        </template>
-        <gl-button
-          variant="success"
-          class="gl-mt-5"
-          :disabled="isTemplateSaving"
-          @click="onSaveTemplate"
-        >
-          {{ __('Save changes') }}
-        </gl-button>
+        <div class="gl-display-flex gl-justify-content-end">
+          <gl-button
+            variant="success"
+            class="gl-mt-5"
+            :disabled="isTemplateSaving"
+            @click="onSaveTemplate"
+          >
+            {{ __('Save changes') }}
+          </gl-button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/related_issues/components/issue_token.vue b/app/assets/javascripts/related_issues/components/issue_token.vue
index 31d0c7dbbb0..bbbdf2cdb49 100644
--- a/app/assets/javascripts/related_issues/components/issue_token.vue
+++ b/app/assets/javascripts/related_issues/components/issue_token.vue
@@ -90,6 +90,7 @@ export default {
           :size="12"
           :title="stateTitle"
           :aria-label="state"
+          data-testid="referenceIcon"
         />
         {{ displayReference }}
       </component>
@@ -105,6 +106,7 @@ export default {
       :title="removeButtonLabel"
       :aria-label="removeButtonLabel"
       :disabled="removeDisabled"
+      data-testid="removeBtn"
       type="button"
       class="js-issue-token-remove-button"
       @click="onRemoveRequest"
diff --git a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
index be5f55a5220..c0fc055a01b 100644
--- a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
+++ b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
@@ -111,7 +111,7 @@ const mixins = {
       return this.isMergeRequest && this.pipelineStatus && Object.keys(this.pipelineStatus).length;
     },
     isOpen() {
-      return this.state === 'opened';
+      return this.state === 'opened' || this.state === 'reopened';
     },
     isClosed() {
       return this.state === 'closed';
diff --git a/app/models/postgresql/replication_slot.rb b/app/models/postgresql/replication_slot.rb
index a4370eda5ba..c96786423e5 100644
--- a/app/models/postgresql/replication_slot.rb
+++ b/app/models/postgresql/replication_slot.rb
@@ -22,8 +22,8 @@ module Postgresql
     def self.lag_too_great?(max = 100.megabytes)
       return false unless in_use?
 
-      lag_function = "#{Gitlab::Database.pg_wal_lsn_diff}" \
-        "(#{Gitlab::Database.pg_current_wal_insert_lsn}(), restart_lsn)::bigint"
+      lag_function = "pg_wal_lsn_diff" \
+        "(pg_current_wal_insert_lsn(), restart_lsn)::bigint"
 
       # We force the use of a transaction here so the query always goes to the
       # primary, even when using the EE DB load balancer.
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index 4273130bbc2..e1f1d8bb8f7 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -1,4 +1,5 @@
 - add_page_startup_api_call discussions_path(@issue)
+- add_page_startup_api_call notes_url
 
 - @gfm_form = true
 
diff --git a/doc/administration/redis/replication_and_failover_external.md b/doc/administration/redis/replication_and_failover_external.md
index ce452d30fc2..680d36b6fde 100644
--- a/doc/administration/redis/replication_and_failover_external.md
+++ b/doc/administration/redis/replication_and_failover_external.md
@@ -228,13 +228,13 @@ which ideally should not have Redis or Sentinels in the same machine:
      sentinels:
        -
          host: 10.0.0.1
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
        -
          host: 10.0.0.2
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
        -
          host: 10.0.0.3
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
    ```
 
 1. [Restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.
@@ -353,13 +353,13 @@ or a failover promotes a different **Primary** node.
      sentinels:
        -
          host: 10.0.0.1
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
        -
          host: 10.0.0.2
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
        -
          host: 10.0.0.3
-         port: 26379 # point to sentinel, not to redis port
+         port: 26379  # point to sentinel, not to redis port
    ```
 
 1. [Restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.
diff --git a/doc/administration/redis/troubleshooting.md b/doc/administration/redis/troubleshooting.md
index 402b60e5b7b..c9976ac791d 100644
--- a/doc/administration/redis/troubleshooting.md
+++ b/doc/administration/redis/troubleshooting.md
@@ -146,13 +146,13 @@ production:
   sentinels:
     -
       host: 10.0.0.1
-      port: 26379 # point to sentinel, not to redis port
+      port: 26379  # point to sentinel, not to redis port
     -
       host: 10.0.0.2
-      port: 26379 # point to sentinel, not to redis port
+      port: 26379  # point to sentinel, not to redis port
     -
       host: 10.0.0.3
-      port: 26379 # point to sentinel, not to redis port
+      port: 26379  # point to sentinel, not to redis port
 ```
 
 When in doubt, read the [Redis Sentinel documentation](https://redis.io/topics/sentinel).
diff --git a/doc/gitlab-geo/after_setup.md b/doc/gitlab-geo/after_setup.md
deleted file mode 100644
index c8a7b9d1096..00000000000
--- a/doc/gitlab-geo/after_setup.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/using_a_geo_server.md'
----
-
-This document was moved to [another location](../administration/geo/replication/using_a_geo_server.md).
diff --git a/doc/gitlab-geo/bring-primary-back.md b/doc/gitlab-geo/bring-primary-back.md
deleted file mode 100644
index 8c43f4d805f..00000000000
--- a/doc/gitlab-geo/bring-primary-back.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/disaster_recovery/bring_primary_back.md'
----
-
-This document was moved to [another location](../administration/geo/disaster_recovery/bring_primary_back.md).
diff --git a/doc/gitlab-geo/configuration.md b/doc/gitlab-geo/configuration.md
deleted file mode 100644
index b46a2caea4a..00000000000
--- a/doc/gitlab-geo/configuration.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/configuration.md'
----
-
-This document was moved to [another location](../administration/geo/replication/configuration.md).
diff --git a/doc/gitlab-geo/configuration_source.md b/doc/gitlab-geo/configuration_source.md
deleted file mode 100644
index b46a2caea4a..00000000000
--- a/doc/gitlab-geo/configuration_source.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/configuration.md'
----
-
-This document was moved to [another location](../administration/geo/replication/configuration.md).
diff --git a/doc/gitlab-geo/database.md b/doc/gitlab-geo/database.md
deleted file mode 100644
index 2f68068d95b..00000000000
--- a/doc/gitlab-geo/database.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/setup/database.md'
----
-
-This document was moved to [another location](../administration/geo/setup/database.md).
diff --git a/doc/gitlab-geo/database_source.md b/doc/gitlab-geo/database_source.md
deleted file mode 100644
index 2f68068d95b..00000000000
--- a/doc/gitlab-geo/database_source.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/setup/database.md'
----
-
-This document was moved to [another location](../administration/geo/setup/database.md).
diff --git a/doc/gitlab-geo/disaster-recovery.md b/doc/gitlab-geo/disaster-recovery.md
deleted file mode 100644
index d42e815a879..00000000000
--- a/doc/gitlab-geo/disaster-recovery.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/disaster_recovery/index.md'
----
-
-This document was moved to [another location](../administration/geo/disaster_recovery/index.md).
diff --git a/doc/gitlab-geo/docker_registry.md b/doc/gitlab-geo/docker_registry.md
deleted file mode 100644
index 26a708f6845..00000000000
--- a/doc/gitlab-geo/docker_registry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/docker_registry.md'
----
-
-This document was moved to [another location](../administration/geo/replication/docker_registry.md).
diff --git a/doc/gitlab-geo/faq.md b/doc/gitlab-geo/faq.md
deleted file mode 100644
index f1952bc7e4c..00000000000
--- a/doc/gitlab-geo/faq.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/faq.md'
----
-
-This document was moved to [another location](../administration/geo/replication/faq.md).
diff --git a/doc/gitlab-geo/ha.md b/doc/gitlab-geo/ha.md
deleted file mode 100644
index 0be70791d45..00000000000
--- a/doc/gitlab-geo/ha.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/multiple_servers.md'
----
-
-This document was moved to [another location](../administration/geo/replication/multiple_servers.md).
diff --git a/doc/gitlab-geo/object_storage.md b/doc/gitlab-geo/object_storage.md
deleted file mode 100644
index 1f29b7b7e8c..00000000000
--- a/doc/gitlab-geo/object_storage.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/object_storage.md'
----
-
-This document was moved to [another location](../administration/geo/replication/object_storage.md).
diff --git a/doc/gitlab-geo/planned-failover.md b/doc/gitlab-geo/planned-failover.md
deleted file mode 100644
index 720b6bc9424..00000000000
--- a/doc/gitlab-geo/planned-failover.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/disaster_recovery/planned_failover.md'
----
-
-This document was moved to [another location](../administration/geo/disaster_recovery/planned_failover.md).
diff --git a/doc/gitlab-geo/security-review.md b/doc/gitlab-geo/security-review.md
deleted file mode 100644
index a0a5b0e536c..00000000000
--- a/doc/gitlab-geo/security-review.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/security_review.md'
----
-
-This document was moved to [another location](../administration/geo/replication/security_review.md).
diff --git a/doc/gitlab-geo/ssh.md b/doc/gitlab-geo/ssh.md
deleted file mode 100644
index 4f8db687850..00000000000
--- a/doc/gitlab-geo/ssh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/operations/fast_ssh_key_lookup.md'
----
-
-This document was moved to [another location](../administration/operations/fast_ssh_key_lookup.md).
diff --git a/doc/gitlab-geo/troubleshooting.md b/doc/gitlab-geo/troubleshooting.md
deleted file mode 100644
index 25fe1372c69..00000000000
--- a/doc/gitlab-geo/troubleshooting.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/troubleshooting.md'
----
-
-This document was moved to [another location](../administration/geo/replication/troubleshooting.md).
diff --git a/doc/gitlab-geo/tuning.md b/doc/gitlab-geo/tuning.md
deleted file mode 100644
index 84ac40f99db..00000000000
--- a/doc/gitlab-geo/tuning.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/tuning.md'
----
-
-This document was moved to [another location](../administration/geo/replication/tuning.md).
diff --git a/doc/gitlab-geo/updating_the_geo_nodes.md b/doc/gitlab-geo/updating_the_geo_nodes.md
deleted file mode 100644
index 28234ec02ed..00000000000
--- a/doc/gitlab-geo/updating_the_geo_nodes.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/updating_the_geo_nodes.md'
----
-
-This document was moved to [another location](../administration/geo/replication/updating_the_geo_nodes.md).
diff --git a/doc/gitlab-geo/using_a_geo_server.md b/doc/gitlab-geo/using_a_geo_server.md
deleted file mode 100644
index c8a7b9d1096..00000000000
--- a/doc/gitlab-geo/using_a_geo_server.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-redirect_to: '../administration/geo/replication/using_a_geo_server.md'
----
-
-This document was moved to [another location](../administration/geo/replication/using_a_geo_server.md).
diff --git a/doc/integration/cas.md b/doc/integration/cas.md
index cf4e501e772..eee801350eb 100644
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -45,10 +45,10 @@ To enable the CAS OmniAuth provider you must register your application with your
    - { name: 'cas3',
        label: 'cas',
        args: {
-               url: 'CAS_SERVER',
-               login_url: '/CAS_PATH/login',
-               service_validate_url: '/CAS_PATH/p3/serviceValidate',
-               logout_url: '/CAS_PATH/logout'} }
+         url: 'CAS_SERVER',
+         login_url: '/CAS_PATH/login',
+         service_validate_url: '/CAS_PATH/p3/serviceValidate',
+         logout_url: '/CAS_PATH/logout' } }
    ```
 
 1. Change 'CAS_PATH' to the root of your CAS instance (ie. `cas`).
diff --git a/doc/integration/facebook.md b/doc/integration/facebook.md
index fc65191994d..dbefb560fe7 100644
--- a/doc/integration/facebook.md
+++ b/doc/integration/facebook.md
@@ -83,7 +83,7 @@ To enable the Facebook OmniAuth provider you must register your application with
 
    ```yaml
    - { name: 'facebook', app_id: 'YOUR_APP_ID',
-     app_secret: 'YOUR_APP_SECRET' }
+       app_secret: 'YOUR_APP_SECRET' }
    ```
 
 1. Change 'YOUR_APP_ID' to the API key from Facebook page in step 10.
diff --git a/doc/integration/github.md b/doc/integration/github.md
index ccce4672cbf..4444db46853 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -71,17 +71,18 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
 
    ```yaml
    - { name: 'github', app_id: 'YOUR_APP_ID',
-     app_secret: 'YOUR_APP_SECRET',
-     args: { scope: 'user:email' } }
+       app_secret: 'YOUR_APP_SECRET',
+       args: { scope: 'user:email' } }
    ```
 
    For GitHub Enterprise:
 
    ```yaml
-   - { name: 'github', app_id: 'YOUR_APP_ID',
-     app_secret: 'YOUR_APP_SECRET',
-     url: "https://github.example.com/",
-     args: { scope: 'user:email' } }
+   - { name: 'github',
+       app_id: 'YOUR_APP_ID',
+       app_secret: 'YOUR_APP_SECRET',
+       url: "https://github.example.com/",
+       args: { scope: 'user:email' } }
    ```
 
    **Replace `https://github.example.com/` with your GitHub URL.**
@@ -125,11 +126,12 @@ omnibus_gitconfig['system'] = { "http" => ["sslVerify = false"] }
 For installation from source:
 
 ```yaml
-- { name: 'github', app_id: 'YOUR_APP_ID',
-  app_secret: 'YOUR_APP_SECRET',
-  url: "https://github.example.com/",
-  verify_ssl: false,
-  args: { scope: 'user:email' } }
+- { name: 'github',
+    app_id: 'YOUR_APP_ID',
+    app_secret: 'YOUR_APP_SECRET',
+    url: "https://github.example.com/",
+    verify_ssl: false,
+    args: { scope: 'user:email' } }
 ```
 
 You will also need to disable Git SSL verification on the server hosting GitLab.
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index f423863ce8e..a200f6b6470 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -63,9 +63,10 @@ GitLab.com will generate an application ID and secret key for you to use.
    For installations from source:
 
    ```yaml
-   - { name: 'gitlab', app_id: 'YOUR_APP_ID',
-     app_secret: 'YOUR_APP_SECRET',
-     args: { scope: 'api' } }
+   - { name: 'gitlab',
+       app_id: 'YOUR_APP_ID',
+       app_secret: 'YOUR_APP_SECRET',
+       args: { scope: 'api' } }
    ```
 
 1. Change 'YOUR_APP_ID' to the Application ID from the GitLab.com application page.
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 0f848bbc7aa..4cf589c1da8 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -84,9 +84,10 @@ On your GitLab server:
    For installations from source:
 
    ```yaml
-   - { name: 'google_oauth2', app_id: 'YOUR_APP_ID',
-     app_secret: 'YOUR_APP_SECRET',
-     args: { access_type: 'offline', approval_prompt: '' } }
+   - { name: 'google_oauth2',
+       app_id: 'YOUR_APP_ID',
+       app_secret: 'YOUR_APP_SECRET',
+       args: { access_type: 'offline', approval_prompt: '' } }
    ```
 
 1. Change `YOUR_APP_ID` to the client ID from the Google Developer page
diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md
index 1b14b5a986f..11ea74f3430 100644
--- a/doc/integration/kerberos.md
+++ b/doc/integration/kerberos.md
@@ -207,9 +207,10 @@ remove the OmniAuth provider named `kerberos` from your `gitlab.yml` /
 
    ```yaml
    omniauth:
+     # Rest of configuration omitted
      # ...
      providers:
-       - { name: 'kerberos' } # <-- remove this line
+       - { name: 'kerberos' }  # <-- remove this line
    ```
 
 1. [Restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect.
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 18fa1a86ca9..cf09c2f2803 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -104,21 +104,21 @@ To change these settings:
 
   ```yaml
   ## OmniAuth settings
-   omniauth:
-     # Allow login via Twitter, Google, etc. using OmniAuth providers
-     # Versions prior to 11.4 require this to be set to true
-     # enabled: true
+  omniauth:
+    # Allow login via Twitter, Google, etc. using OmniAuth providers
+    # Versions prior to 11.4 require this to be set to true
+    # enabled: true
 
-     # CAUTION!
-     # This allows users to login without having a user account first. Define the allowed providers
-     # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none.
-     # User accounts will be created automatically when authentication was successful.
-     allow_single_sign_on: ["saml", "twitter"]
+    # CAUTION!
+    # This allows users to login without having a user account first. Define the allowed providers
+    # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none.
+    # User accounts will be created automatically when authentication was successful.
+    allow_single_sign_on: ["saml", "twitter"]
 
-     auto_link_ldap_user: true
+    auto_link_ldap_user: true
 
-     # Locks down those users until they have been cleared by the admin (default: true).
-     block_auto_created_users: true
+    # Locks down those users until they have been cleared by the admin (default: true).
+    block_auto_created_users: true
   ```
 
 Now we can choose one or more of the [Supported Providers](#supported-providers)
@@ -142,7 +142,7 @@ The chosen OmniAuth provider is now active and can be used to sign in to GitLab
 
 ## Automatically Link Existing Users to OmniAuth Users
 
-> [Introduced in GitLab 13.4.](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664)
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36664) in GitLab 13.4.
 
 You can automatically link OmniAuth users with existing GitLab users if their email addresses match.
 For example, the following setting is used to enable the auto link feature for both a SAML provider and the Twitter OAuth provider:
diff --git a/doc/integration/salesforce.md b/doc/integration/salesforce.md
index 7e0b2518e76..dbd0a03e3cf 100644
--- a/doc/integration/salesforce.md
+++ b/doc/integration/salesforce.md
@@ -64,7 +64,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
    - { name: 'salesforce',
        app_id: 'SALESFORCE_CLIENT_ID',
        app_secret: 'SALESFORCE_CLIENT_SECRET'
-     }
+   }
    ```
 
 1. Change `SALESFORCE_CLIENT_ID` to the Consumer Key from the Salesforce connected application page.
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index b8195aea040..ee08a0026cd 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -113,16 +113,16 @@ in your SAML IdP:
    omniauth:
      providers:
        - {
-           name: 'saml',
-           args: {
-                  assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
-                  idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
-                  idp_sso_target_url: 'https://login.example.com/idp',
-                  issuer: 'https://gitlab.example.com',
-                  name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
-                },
-           label: 'Company Login' # optional label for SAML login button, defaults to "Saml"
-         }
+         name: 'saml',
+         args: {
+           assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
+           idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
+           idp_sso_target_url: 'https://login.example.com/idp',
+           issuer: 'https://gitlab.example.com',
+           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
+         },
+         label: 'Company Login'  # optional label for SAML login button, defaults to "Saml"
+       }
    ```
 
 1. Change the value for `assertion_consumer_service_url` to match the HTTPS endpoint
@@ -210,7 +210,7 @@ Example:
           idp_sso_target_url: 'https://login.example.com/idp',
           issuer: 'https://gitlab.example.com',
           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-        } }
+  } }
 ```
 
 ### External Groups **(STARTER ONLY)**
@@ -228,7 +228,7 @@ SAML login supports automatic identification on whether a user should be conside
           idp_sso_target_url: 'https://login.example.com/idp',
           issuer: 'https://gitlab.example.com',
           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent'
-        } }
+  } }
 ```
 
 ### Admin Groups **(STARTER ONLY)**
@@ -248,7 +248,7 @@ considered admin users.
           idp_sso_target_url: 'https://login.example.com/idp',
           issuer: 'https://gitlab.example.com',
           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-        } }
+  } }
 ```
 
 ### Auditor Groups **(STARTER ONLY)**
@@ -270,7 +270,7 @@ considered auditor users.
           idp_sso_target_url: 'https://login.example.com/idp',
           issuer: 'https://gitlab.example.com',
           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-        } }
+  } }
 ```
 
 ## Bypass two factor authentication
@@ -328,22 +328,22 @@ In addition to the changes in GitLab, make sure that your IdP is returning the
    omniauth:
      providers:
        - {
-           name: 'saml',
-           args: {
-                   assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
-                   idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
-                   idp_sso_target_url: 'https://login.example.com/idp',
-                   issuer: 'https://gitlab.example.com',
-                   name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
-                   upstream_two_factor_authn_contexts:
-                     [
-                       'urn:oasis:names:tc:SAML:2.0:ac:classes:CertificateProtectedTransport',
-                       'urn:oasis:names:tc:SAML:2.0:ac:classes:SecondFactorOTPSMS',
-                       'urn:oasis:names:tc:SAML:2.0:ac:classes:SecondFactorIGTOKEN'
-                     ]
-                 },
-           label: 'Company Login' # optional label for SAML login button, defaults to "Saml"
-         }
+         name: 'saml',
+         args: {
+           assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
+           idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
+           idp_sso_target_url: 'https://login.example.com/idp',
+           issuer: 'https://gitlab.example.com',
+           name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
+           upstream_two_factor_authn_contexts:
+             [
+               'urn:oasis:names:tc:SAML:2.0:ac:classes:CertificateProtectedTransport',
+               'urn:oasis:names:tc:SAML:2.0:ac:classes:SecondFactorOTPSMS',
+               'urn:oasis:names:tc:SAML:2.0:ac:classes:SecondFactorIGTOKEN'
+             ]
+         },
+         label: 'Company Login'  # optional label for SAML login button, defaults to "Saml"
+       }
    ```
 
 1. Save the file and [restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect
@@ -436,7 +436,7 @@ args: {
         issuer: 'https://gitlab.example.com',
         name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
         attribute_statements: { email: ['EmailAddress'] },
-        allowed_clock_drift: 1 # for one second clock drift
+        allowed_clock_drift: 1  # for one second clock drift
 }
 ```
 
@@ -561,10 +561,10 @@ args: {
     <redacted>
     -----END PRIVATE KEY-----',
   security: {
-    authn_requests_signed: true, # enable signature on AuthNRequest
-    want_assertions_signed: true, # enable the requirement of signed assertion
-    embed_sign: true, # embedded signature or HTTP GET parameter signature
-    metadata_signed: false, # enable signature on Metadata
+    authn_requests_signed: true,  # enable signature on AuthNRequest
+    want_assertions_signed: true,  # enable the requirement of signed assertion
+    embed_sign: true,  # embedded signature or HTTP GET parameter signature
+    metadata_signed: false,  # enable signature on Metadata
     signature_method: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
     digest_method: 'http://www.w3.org/2001/04/xmlenc#sha256',
   }
@@ -629,9 +629,9 @@ Group SAML on a self-managed instance is limited when compared to the recommende
 
     ```yaml
     omniauth:
-        enabled: true
-        providers:
-          - { name: 'group_saml' }
+      enabled: true
+      providers:
+        - { name: 'group_saml' }
     ```
 
 ## Troubleshooting
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index 95de56f24d8..e501eac0c5f 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -65,7 +65,8 @@ To enable the Twitter OmniAuth provider you must register your application with
    For installations from source:
 
    ```yaml
-     - { name: 'twitter', app_id: 'YOUR_APP_ID',
+   - { name: 'twitter',
+       app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET' }
    ```
 
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index e8f9142a36c..c0a16da3702 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -70,7 +70,8 @@ receivers:
         bearer_token: 9e1cbfcd546896a9ea8be557caf13a76
       send_resolved: true
       url: http://192.168.178.31:3001/root/manual_prometheus/prometheus/alerts/notify.json
-  ...
+      # Rest of configuration omitted
+      # ...
 ```
 
 For GitLab to associate your alerts with an [environment](../../ci/environments/index.md),
diff --git a/doc/operations/metrics/dashboards/panel_types.md b/doc/operations/metrics/dashboards/panel_types.md
index f9038795cfe..20f6e25cb6b 100644
--- a/doc/operations/metrics/dashboards/panel_types.md
+++ b/doc/operations/metrics/dashboards/panel_types.md
@@ -17,7 +17,7 @@ dashboard: 'Dashboard Title'
 panel_groups:
   - group: 'Group Title'
     panels:
-      - type: area-chart # or line-chart
+      - type: area-chart  # or line-chart
         title: 'Area Chart Title'
         y_label: 'Y-Axis'
         y_axis:
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index cc6777a1ce7..ef4eca32950 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -317,7 +317,7 @@ metadata:
   name: gitlab-managed-apps-default-proxy
   namespace: gitlab-managed-apps
 spec:
-   env:
+  env:
     - name: http_proxy
       value: "PUT_YOUR_HTTP_PROXY_HERE"
     - name: https_proxy
diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md
index e6f78a80d45..4065ee3337b 100644
--- a/doc/user/clusters/agent/index.md
+++ b/doc/user/clusters/agent/index.md
@@ -125,27 +125,27 @@ the Agent in subsequent steps. You can create an Agent record either:
 
 - Through GraphQL: **(PREMIUM ONLY)**
 
-  ```json
-    mutation createAgent {
-      createClusterAgent(input: { projectPath: "path-to/your-awesome-project", name: "<agent-name>" }) {
-        clusterAgent {
-          id
-          name
-        }
-        errors
+  ```graphql
+  mutation createAgent {
+    createClusterAgent(input: { projectPath: "path-to/your-awesome-project", name: "<agent-name>" }) {
+      clusterAgent {
+        id
+        name
       }
+      errors
     }
+  }
 
-    mutation createToken {
-      clusterAgentTokenCreate(input: { clusterAgentId: <cluster-agent-id-taken-from-the-previous-mutation> }) {
-        secret # This is the value you need to use on the next step
-        token {
-          createdAt
-          id
-        }
-        errors
+  mutation createToken {
+    clusterAgentTokenCreate(input: { clusterAgentId: <cluster-agent-id-taken-from-the-previous-mutation> }) {
+      secret # This is the value you need to use on the next step
+      token {
+        createdAt
+        id
       }
+      errors
     }
+  }
   ```
 
   NOTE: **Note:**
@@ -245,7 +245,7 @@ spec:
         args:
         - --token-file=/config/token
         - --kas-address
-        - grpc://host.docker.internal:5005 # {"$openapi":"kas-address"}
+        - grpc://host.docker.internal:5005  # {"$openapi":"kas-address"}
         volumeMounts:
         - name: token-volume
           mountPath: /config
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md
index 96926fb7a07..21f216aa50a 100644
--- a/doc/user/project/clusters/add_remove_clusters.md
+++ b/doc/user/project/clusters/add_remove_clusters.md
@@ -269,7 +269,7 @@ To add a Kubernetes cluster to your project, group, or instance:
 
          Copy the `<authentication_token>` value from the output:
 
-         ```yaml
+         ```plaintext
          Name:         gitlab-token-b5zv4
          Namespace:    kube-system
          Labels:       <none>
diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md
index 543ffdbce8f..d662dc4f715 100644
--- a/doc/user/project/clusters/serverless/aws.md
+++ b/doc/user/project/clusters/serverless/aws.md
@@ -222,7 +222,8 @@ the environment of the deployed function:
 
 ```yaml
 provider:
-  ...
+  # Other configuration omitted
+  # ...
   environment:
     A_VARIABLE: ${env:A_VARIABLE}
 ```
@@ -245,10 +246,10 @@ functions:
   hello:
     handler: src/handler.hello
     events:
-      - http: # Rewrite this part to enable CORS
+      - http:  # Rewrite this part to enable CORS
           path: hello
           method: get
-          cors: true # <-- CORS here
+          cors: true  # <-- CORS here
 ```
 
 You also need to return CORS specific headers in your function response:
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index accc6330253..d9c4b1cb280 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -92,10 +92,6 @@ module Gitlab
       @version ||= database_version.match(/\A(?:PostgreSQL |)([^\s]+).*\z/)[1]
     end
 
-    def self.postgresql_9_or_less?
-      version.to_f < 10
-    end
-
     def self.postgresql_minimum_supported_version?
       version.to_f >= MINIMUM_POSTGRES_VERSION
     end
@@ -127,28 +123,6 @@ module Gitlab
       # ignore - happens when Rake tasks yet have to create a database, e.g. for testing
     end
 
-    # map some of the function names that changed between PostgreSQL 9 and 10
-    # https://wiki.postgresql.org/wiki/New_in_postgres_10
-    def self.pg_wal_lsn_diff
-      Gitlab::Database.postgresql_9_or_less? ? 'pg_xlog_location_diff' : 'pg_wal_lsn_diff'
-    end
-
-    def self.pg_current_wal_insert_lsn
-      Gitlab::Database.postgresql_9_or_less? ? 'pg_current_xlog_insert_location' : 'pg_current_wal_insert_lsn'
-    end
-
-    def self.pg_last_wal_receive_lsn
-      Gitlab::Database.postgresql_9_or_less? ? 'pg_last_xlog_receive_location' : 'pg_last_wal_receive_lsn'
-    end
-
-    def self.pg_last_wal_replay_lsn
-      Gitlab::Database.postgresql_9_or_less? ? 'pg_last_xlog_replay_location' : 'pg_last_wal_replay_lsn'
-    end
-
-    def self.pg_last_xact_replay_timestamp
-      'pg_last_xact_replay_timestamp'
-    end
-
     def self.nulls_last_order(field, direction = 'ASC')
       Arel.sql("#{field} #{direction} NULLS LAST")
     end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9bfd0566620..50901e07999 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2686,6 +2686,9 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
+msgid "An error occured while making the changes: %{error}"
+msgstr ""
+
 msgid "An error occurred adding a draft to the thread."
 msgstr ""
 
@@ -2959,9 +2962,6 @@ msgstr ""
 msgid "An error occurred while saving assignees"
 msgstr ""
 
-msgid "An error occurred while saving the template. Please check if the template exists."
-msgstr ""
-
 msgid "An error occurred while searching for milestones"
 msgstr ""
 
@@ -9527,6 +9527,9 @@ msgstr ""
 msgid "Emails sent from Service Desk will have this name"
 msgstr ""
 
+msgid "Emails sent to %{email} will still be supported"
+msgstr ""
+
 msgid "Emails separated by comma"
 msgstr ""
 
diff --git a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
index bfbe4ec8e70..17a195df494 100644
--- a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
+++ b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
@@ -48,7 +48,10 @@ describe('AddIssuableForm', () => {
     const input = findFormInput(wrapper);
     if (input) input.blur();
 
-    wrapper.destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
   describe('with data', () => {
diff --git a/spec/frontend/issuable/related_issues/components/issue_token_spec.js b/spec/frontend/issuable/related_issues/components/issue_token_spec.js
index 553721fa783..f2cb9042ba6 100644
--- a/spec/frontend/issuable/related_issues/components/issue_token_spec.js
+++ b/spec/frontend/issuable/related_issues/components/issue_token_spec.js
@@ -1,241 +1,146 @@
-import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
 import { PathIdSeparator } from '~/related_issues/constants';
-import issueToken from '~/related_issues/components/issue_token.vue';
+import IssueToken from '~/related_issues/components/issue_token.vue';
 
 describe('IssueToken', () => {
   const idKey = 200;
   const displayReference = 'foo/bar#123';
-  const title = 'some title';
-  const pathIdSeparator = PathIdSeparator.Issue;
   const eventNamespace = 'pendingIssuable';
-  let IssueToken;
-  let vm;
+  const path = '/foo/bar/issues/123';
+  const pathIdSeparator = PathIdSeparator.Issue;
+  const title = 'some title';
 
-  beforeEach(() => {
-    IssueToken = Vue.extend(issueToken);
-  });
+  let wrapper;
+
+  const defaultProps = {
+    idKey,
+    displayReference,
+    pathIdSeparator,
+  };
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(IssueToken, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
 
   afterEach(() => {
-    if (vm) {
-      vm.$destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
     }
   });
 
+  const findLink = () => wrapper.find({ ref: 'link' });
+  const findReference = () => wrapper.find({ ref: 'reference' });
+  const findReferenceIcon = () => wrapper.find('[data-testid="referenceIcon"]');
+  const findRemoveBtn = () => wrapper.find('[data-testid="removeBtn"]');
+  const findTitle = () => wrapper.find({ ref: 'title' });
+
   describe('with reference supplied', () => {
     beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-        },
-      }).$mount();
+      createComponent();
     });
 
     it('shows reference', () => {
-      expect(vm.$el.textContent.trim()).toEqual(displayReference);
+      expect(wrapper.text()).toContain(displayReference);
     });
 
     it('does not link without path specified', () => {
-      expect(vm.$refs.link.tagName.toLowerCase()).toEqual('span');
-      expect(vm.$refs.link.getAttribute('href')).toBeNull();
+      expect(findLink().element.tagName).toBe('SPAN');
+      expect(findLink().attributes('href')).toBeUndefined();
     });
   });
 
   describe('with reference and title supplied', () => {
-    beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-          title,
-        },
-      }).$mount();
-    });
-
     it('shows reference and title', () => {
-      expect(vm.$refs.reference.textContent.trim()).toEqual(displayReference);
-      expect(vm.$refs.title.textContent.trim()).toEqual(title);
+      createComponent({
+        title,
+      });
+
+      expect(findReference().text()).toBe(displayReference);
+      expect(findTitle().text()).toBe(title);
     });
   });
 
-  describe('with path supplied', () => {
-    const path = '/foo/bar/issues/123';
-    beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-          title,
-          path,
-        },
-      }).$mount();
-    });
-
+  describe('with path and title supplied', () => {
     it('links reference and title', () => {
-      expect(vm.$refs.link.getAttribute('href')).toEqual(path);
+      createComponent({
+        path,
+        title,
+      });
+
+      expect(findLink().attributes('href')).toBe(path);
     });
   });
 
   describe('with state supplied', () => {
-    describe("`state: 'opened'`", () => {
-      beforeEach(() => {
-        vm = new IssueToken({
-          propsData: {
-            idKey,
-            eventNamespace,
-            displayReference,
-            pathIdSeparator,
-            state: 'opened',
-          },
-        }).$mount();
+    it.each`
+      state         | icon              | cssClass
+      ${'opened'}   | ${'issue-open-m'} | ${'issue-token-state-icon-open'}
+      ${'reopened'} | ${'issue-open-m'} | ${'issue-token-state-icon-open'}
+      ${'closed'}   | ${'issue-close'}  | ${'issue-token-state-icon-closed'}
+    `('shows "$icon" icon when "$state"', ({ state, icon, cssClass }) => {
+      createComponent({
+        path,
+        state,
       });
 
-      it('shows green circle icon', () => {
-        expect(vm.$el.querySelector('.issue-token-state-icon-open.fa.fa-circle-o')).toBeDefined();
-      });
-    });
-
-    describe("`state: 'reopened'`", () => {
-      beforeEach(() => {
-        vm = new IssueToken({
-          propsData: {
-            idKey,
-            eventNamespace,
-            displayReference,
-            pathIdSeparator,
-            state: 'reopened',
-          },
-        }).$mount();
-      });
-
-      it('shows green circle icon', () => {
-        expect(vm.$el.querySelector('.issue-token-state-icon-open.fa.fa-circle-o')).toBeDefined();
-      });
-    });
-
-    describe("`state: 'closed'`", () => {
-      beforeEach(() => {
-        vm = new IssueToken({
-          propsData: {
-            idKey,
-            eventNamespace,
-            displayReference,
-            pathIdSeparator,
-            state: 'closed',
-          },
-        }).$mount();
-      });
-
-      it('shows red minus icon', () => {
-        expect(vm.$el.querySelector('.issue-token-state-icon-closed.fa.fa-minus')).toBeDefined();
-      });
+      expect(findReferenceIcon().props('name')).toBe(icon);
+      expect(findReferenceIcon().classes()).toContain(cssClass);
     });
   });
 
   describe('with reference, title, state', () => {
     const state = 'opened';
-    beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-          title,
-          state,
-        },
-      }).$mount();
-    });
 
     it('shows reference, title, and state', () => {
-      const stateIcon = vm.$refs.reference.querySelector('svg');
+      createComponent({
+        title,
+        state,
+      });
 
-      expect(stateIcon.getAttribute('aria-label')).toEqual(state);
-      expect(vm.$refs.reference.textContent.trim()).toEqual(displayReference);
-      expect(vm.$refs.title.textContent.trim()).toEqual(title);
+      expect(findReferenceIcon().attributes('aria-label')).toBe(state);
+      expect(findReference().text()).toBe(displayReference);
+      expect(findTitle().text()).toBe(title);
     });
   });
 
   describe('with canRemove', () => {
     describe('`canRemove: false` (default)', () => {
-      beforeEach(() => {
-        vm = new IssueToken({
-          propsData: {
-            idKey,
-            eventNamespace,
-            displayReference,
-            pathIdSeparator,
-          },
-        }).$mount();
-      });
-
       it('does not have remove button', () => {
-        expect(vm.$el.querySelector('.issue-token-remove-button')).toBeNull();
+        createComponent();
+
+        expect(findRemoveBtn().exists()).toBe(false);
       });
     });
 
     describe('`canRemove: true`', () => {
       beforeEach(() => {
-        vm = new IssueToken({
-          propsData: {
-            idKey,
-            eventNamespace,
-            displayReference,
-            pathIdSeparator,
-            canRemove: true,
-          },
-        }).$mount();
+        createComponent({
+          eventNamespace,
+          canRemove: true,
+        });
       });
 
       it('has remove button', () => {
-        expect(vm.$el.querySelector('.issue-token-remove-button')).toBeDefined();
+        expect(findRemoveBtn().exists()).toBe(true);
+      });
+
+      it('emits event when clicked', () => {
+        findRemoveBtn().trigger('click');
+
+        const emitted = wrapper.emitted(`${eventNamespace}RemoveRequest`);
+
+        expect(emitted).toHaveLength(1);
+        expect(emitted[0]).toEqual([idKey]);
+      });
+
+      it('tooltip should not be escaped', () => {
+        expect(findRemoveBtn().attributes('data-original-title')).toBe(
+          `Remove ${displayReference}`,
+        );
       });
     });
   });
-
-  describe('methods', () => {
-    beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-        },
-      }).$mount();
-    });
-
-    it('when getting checked', () => {
-      jest.spyOn(vm, '$emit').mockImplementation(() => {});
-      vm.onRemoveRequest();
-
-      expect(vm.$emit).toHaveBeenCalledWith('pendingIssuableRemoveRequest', vm.idKey);
-    });
-  });
-
-  describe('tooltip', () => {
-    beforeEach(() => {
-      vm = new IssueToken({
-        propsData: {
-          idKey,
-          eventNamespace,
-          displayReference,
-          pathIdSeparator,
-          canRemove: true,
-        },
-      }).$mount();
-    });
-
-    it('should not be escaped', () => {
-      const { originalTitle } = vm.$refs.removeButton.dataset;
-
-      expect(originalTitle).toEqual(`Remove ${displayReference}`);
-    });
-  });
 });
diff --git a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
index 0f88e4d71fe..b758b85beef 100644
--- a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
+++ b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
@@ -18,7 +18,10 @@ describe('RelatedIssuesBlock', () => {
   const findIssueCountBadgeAddButton = () => wrapper.find(GlButton);
 
   afterEach(() => {
-    wrapper.destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
   describe('with defaults', () => {
diff --git a/spec/frontend/issuable/related_issues/components/related_issues_list_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_list_spec.js
index 6cf0b9d21ea..39bc244297b 100644
--- a/spec/frontend/issuable/related_issues/components/related_issues_list_spec.js
+++ b/spec/frontend/issuable/related_issues/components/related_issues_list_spec.js
@@ -14,7 +14,10 @@ describe('RelatedIssuesList', () => {
   let wrapper;
 
   afterEach(() => {
-    wrapper.destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
   describe('with defaults', () => {
diff --git a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js
index 0f3b699f6b2..62aeb4ddee5 100644
--- a/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js
+++ b/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js
@@ -218,9 +218,7 @@ describe('ServiceDeskRoot', () => {
       .$nextTick()
       .then(waitForPromises)
       .then(() => {
-        expect(wrapper.html()).toContain(
-          'An error occurred while saving the template. Please check if the template exists.',
-        );
+        expect(wrapper.html()).toContain('An error occured while making the changes:');
       });
   });
 });
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 420aa0a8df6..dd3daf1b2c5 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -70,25 +70,6 @@ RSpec.describe Gitlab::Database do
     end
   end
 
-  describe '.postgresql_9_or_less?' do
-    it 'returns true when using postgresql 8.4' do
-      allow(described_class).to receive(:version).and_return('8.4')
-      expect(described_class.postgresql_9_or_less?).to eq(true)
-    end
-
-    it 'returns true when using PostgreSQL 9.6' do
-      allow(described_class).to receive(:version).and_return('9.6')
-
-      expect(described_class.postgresql_9_or_less?).to eq(true)
-    end
-
-    it 'returns false when using PostgreSQL 10 or newer' do
-      allow(described_class).to receive(:version).and_return('10')
-
-      expect(described_class.postgresql_9_or_less?).to eq(false)
-    end
-  end
-
   describe '.postgresql_minimum_supported_version?' do
     it 'returns false when using PostgreSQL 10' do
       allow(described_class).to receive(:version).and_return('10')
@@ -150,68 +131,6 @@ RSpec.describe Gitlab::Database do
     end
   end
 
-  describe '.pg_wal_lsn_diff' do
-    it 'returns old name when using PostgreSQL 9.6' do
-      allow(described_class).to receive(:version).and_return('9.6')
-
-      expect(described_class.pg_wal_lsn_diff).to eq('pg_xlog_location_diff')
-    end
-
-    it 'returns new name when using PostgreSQL 10 or newer' do
-      allow(described_class).to receive(:version).and_return('10')
-
-      expect(described_class.pg_wal_lsn_diff).to eq('pg_wal_lsn_diff')
-    end
-  end
-
-  describe '.pg_current_wal_insert_lsn' do
-    it 'returns old name when using PostgreSQL 9.6' do
-      allow(described_class).to receive(:version).and_return('9.6')
-
-      expect(described_class.pg_current_wal_insert_lsn).to eq('pg_current_xlog_insert_location')
-    end
-
-    it 'returns new name when using PostgreSQL 10 or newer' do
-      allow(described_class).to receive(:version).and_return('10')
-
-      expect(described_class.pg_current_wal_insert_lsn).to eq('pg_current_wal_insert_lsn')
-    end
-  end
-
-  describe '.pg_last_wal_receive_lsn' do
-    it 'returns old name when using PostgreSQL 9.6' do
-      allow(described_class).to receive(:version).and_return('9.6')
-
-      expect(described_class.pg_last_wal_receive_lsn).to eq('pg_last_xlog_receive_location')
-    end
-
-    it 'returns new name when using PostgreSQL 10 or newer' do
-      allow(described_class).to receive(:version).and_return('10')
-
-      expect(described_class.pg_last_wal_receive_lsn).to eq('pg_last_wal_receive_lsn')
-    end
-  end
-
-  describe '.pg_last_wal_replay_lsn' do
-    it 'returns old name when using PostgreSQL 9.6' do
-      allow(described_class).to receive(:version).and_return('9.6')
-
-      expect(described_class.pg_last_wal_replay_lsn).to eq('pg_last_xlog_replay_location')
-    end
-
-    it 'returns new name when using PostgreSQL 10 or newer' do
-      allow(described_class).to receive(:version).and_return('10')
-
-      expect(described_class.pg_last_wal_replay_lsn).to eq('pg_last_wal_replay_lsn')
-    end
-  end
-
-  describe '.pg_last_xact_replay_timestamp' do
-    it 'returns pg_last_xact_replay_timestamp' do
-      expect(described_class.pg_last_xact_replay_timestamp).to eq('pg_last_xact_replay_timestamp')
-    end
-  end
-
   describe '.nulls_last_order' do
     it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column ASC NULLS LAST'}
     it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC NULLS LAST'}