Add latest changes from gitlab-org/gitlab@master

.gitlab/ci/docs.gitlab-ci.yml

@@ -42,7 +42,7 @@ docs lint:
   extends:
     - .default-retry
     - .docs:rules:docs-lint
-  image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:vale-2.4.0-markdownlint-0.23.2"
+  image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:ruby-2.7.2-alpine-3.12-vale-2.4.3-markdownlint-0.24.0"
   stage: test
   needs: []
   script:

changelogs/unreleased/Replace-GlDeprecatedDropdown-with-GlDropdown-in-ee-app-assets-javascripts.yml

@@ -0,0 +1,5 @@
+---
+title: Replace-GlDeprecatedDropdown-with-GlDropdown-in-ee/app/assets/javascripts/geo_node_form-and-ee/app/assets/javascripts/geo_replicable
+merge_request: 41438
+author: nuwe1
+type: other

doc/integration/README.md

@@ -8,15 +8,8 @@ GitLab can be integrated with external services for enhanced functionality.
 
 ## Issue trackers
 
-You can use an [external issue tracker](external-issue-tracker.md) at the same time as the GitLab issue tracker, or use only the external issue tracker.
-
-GitLab can be integrated with the following external issue trackers:
-
-- Jira
-- Redmine
-- Bugzilla
-- EWM
-- YouTrack
+You can use an [external issue tracker](external-issue-tracker.md) at the same time as the GitLab
+issue tracker, or use only the external issue tracker.
 
 ## Authentication sources
 
@@ -29,7 +22,7 @@ GitLab can be configured to authenticate access requests with the following auth
 - Enable sign in via [LDAP](../administration/auth/ldap/index.md).
 - Enable [OAuth2 provider](oauth_provider.md) application creation.
 - Use [OmniAuth](omniauth.md) to enable sign in via Twitter, GitHub, GitLab.com, Google,
-Bitbucket, Facebook, Shibboleth, SAML, Crowd, Azure or Authentiq ID.
+  Bitbucket, Facebook, Shibboleth, SAML, Crowd, Azure or Authentiq ID.
 - Use GitLab as an [OpenID Connect](openid_connect_provider.md) identity provider.
 - Authenticate to [Vault](vault.md) through GitLab OpenID Connect.
 - Configure GitLab as a [SAML](saml.md) 2.0 Service Provider.

doc/integration/external-issue-tracker.md

@@ -1,7 +1,7 @@
 # External issue tracker
 
-GitLab has a great [issue tracker](../user/project/issues/index.md) but you can also use an external one
-such as Jira, Redmine, YouTrack, Bugzilla, or EWM. External issue trackers are configurable per GitLab project.
+GitLab has a great [issue tracker](../user/project/issues/index.md) but you can also use an external
+one. External issue trackers are configurable per GitLab project.
 
 Once configured, you can reference external issues using the format `CODE-123`, where:
 
@@ -15,24 +15,23 @@ GitLab menu always opens the internal issue tracker. When disabled, the link is
 
 ## Configuration
 
-The configuration is done via a project's **Integrations**.
+The configuration is done via a project's **Settings > Integrations**.
 
 ### Integration
 
 To enable an external issue tracker you must configure the appropriate **Integration**.
 Visit the links below for details:
 
+- [Bugzilla](../user/project/integrations/bugzilla.md)
+- [Custom Issue Tracker](../user/project/integrations/custom_issue_tracker.md)
+- [Engineering Workflow Management](../user/project/integrations/ewm.md)
+- [Jira](../user/project/integrations/jira.md)
 - [Redmine](../user/project/integrations/redmine.md)
 - [YouTrack](../user/project/integrations/youtrack.md)
-- [Jira](../user/project/integrations/jira.md)
-- [Bugzilla](../user/project/integrations/bugzilla.md)
-- [EWM](../user/project/integrations/ewm.md)
-- [Custom Issue Tracker](../user/project/integrations/custom_issue_tracker.md)
 
 ### Service Template
 
-To save you the hassle from configuring each project's service individually,
-GitLab provides the ability to set Service Templates which can then be
-overridden in each project's settings.
+To avoid configuring each project's service individually, GitLab provides the ability to set
+Service Templates. These can then be overridden in each project's settings.
 
 Read more on [Services Templates](../user/project/integrations/services_templates.md).