diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /doc/integration | |
parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) | |
download | gitlab-ce-0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
-rw-r--r-- | doc/integration/elasticsearch.md | 6 | ||||
-rw-r--r-- | doc/integration/saml.md | 2 | ||||
-rw-r--r-- | doc/integration/slash_commands.md | 2 | ||||
-rw-r--r-- | doc/integration/sourcegraph.md | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md index c3e85002db8..fcc4646bfd5 100644 --- a/doc/integration/elasticsearch.md +++ b/doc/integration/elasticsearch.md @@ -1,7 +1,7 @@ # Elasticsearch integration **(STARTER ONLY)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/109 "Elasticsearch Merge Request") in GitLab [Starter](https://about.gitlab.com/pricing/) 8.4. Support -> for [Amazon Elasticsearch](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html) was [introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/1305) in GitLab +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109 "Elasticsearch Merge Request") in GitLab [Starter](https://about.gitlab.com/pricing/) 8.4. Support +> for [Amazon Elasticsearch](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg.html) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1305) in GitLab > [Starter](https://about.gitlab.com/pricing/) 9.0. This document describes how to set up Elasticsearch with GitLab. Once enabled, @@ -199,7 +199,7 @@ To backfill existing data, you can use one of the methods below to index it in b ### Indexing through the administration UI -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/15390) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.3. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/15390) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.3. To index via the Admin Area: diff --git a/doc/integration/saml.md b/doc/integration/saml.md index a4e96adca47..c5c918e4282 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -414,7 +414,7 @@ args: { ### `uid_attribute` -> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/17734) in GitLab 10.7. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17734) in GitLab 10.7. By default, the `uid` is set as the `name_id` in the SAML response. If you'd like to designate a unique attribute for the `uid`, you can set the `uid_attribute`. In the example below, the value of `uid` attribute in the SAML response is set as the `uid_attribute`. diff --git a/doc/integration/slash_commands.md b/doc/integration/slash_commands.md index bc2f190920c..f74a4f1a77f 100644 --- a/doc/integration/slash_commands.md +++ b/doc/integration/slash_commands.md @@ -1,6 +1,6 @@ # Slash Commands -> The `run` command was [introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/4466) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.6. [Moved](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24780) to [GitLab Core](https://about.gitlab.com/pricing/) in 11.9. +> The `run` command was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4466) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.6. [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24780) to [GitLab Core](https://about.gitlab.com/pricing/) in 11.9. Slash commands in Mattermost and Slack allow you to control GitLab and view GitLab content right inside your chat client, without having to leave it. For Slack, this requires a [project service configuration](../user/project/integrations/slack_slash_commands.md). Simply type the command as a message in your chat client to activate it. diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md index c400d5a9a63..ae818f285b8 100644 --- a/doc/integration/sourcegraph.md +++ b/doc/integration/sourcegraph.md @@ -4,7 +4,7 @@ type: reference, how-to # Sourcegraph integration -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/16556) in GitLab 12.5. Please note that this integration is in BETA and [behind a feature flag](#enable-the-sourcegraph-feature-flag). +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5. Please note that this integration is in BETA and [behind a feature flag](#enable-the-sourcegraph-feature-flag). [Sourcegraph](https://sourcegraph.com) provides code intelligence features, natively integrated into the GitLab UI. |