From acab9fc89c5856e2d3d3a9af6ff2047cc69055d3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Sep 2021 18:11:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/integration/akismet.md | 2 +- doc/integration/datadog.md | 2 +- doc/integration/github.md | 2 +- doc/integration/gitlab.md | 2 +- doc/integration/gitpod.md | 2 +- doc/integration/jenkins.md | 2 +- doc/integration/jira/dvcs.md | 4 ++-- doc/integration/kerberos.md | 2 +- doc/integration/oauth_provider.md | 2 +- doc/integration/omniauth.md | 4 ++-- doc/integration/sourcegraph.md | 2 +- doc/integration/trello_power_up.md | 2 +- doc/integration/vault.md | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'doc/integration') diff --git a/doc/integration/akismet.md b/doc/integration/akismet.md index 74f2c90f85a..efc293569fe 100644 --- a/doc/integration/akismet.md +++ b/doc/integration/akismet.md @@ -31,7 +31,7 @@ To use Akismet: 1. Click **Show** to reveal the API key, and copy the API key's value. 1. Sign in to GitLab as an administrator. 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Reporting** (`/admin/application_settings/reporting`). +1. On the left sidebar, select **Settings > Reporting** (`/admin/application_settings/reporting`). 1. Select the **Enable Akismet** checkbox. 1. Fill in the API key from step 3. 1. Save the configuration. diff --git a/doc/integration/datadog.md b/doc/integration/datadog.md index ab64088cc65..687be5adcf7 100644 --- a/doc/integration/datadog.md +++ b/doc/integration/datadog.md @@ -28,7 +28,7 @@ project, group, or instance level: 1. *For instance-level integrations:* 1. Sign in to GitLab as a user with the [Administrator role](../user/permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Integrations**. +1. On the left sidebar, select **Settings > Integrations**. 1. Scroll to **Add an integration**, and select **Datadog**. 1. Select **Active** to enable the integration. 1. Specify the [**Datadog site**](https://docs.datadoghq.com/getting_started/site/) to send data to. diff --git a/doc/integration/github.md b/doc/integration/github.md index f3192e0af6c..0a96d67ac0c 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -188,7 +188,7 @@ GitHub account` when signing in, in GitLab: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. In the **Social sign-in** section, select **Connect to GitHub**. After that, you should be able to sign in via GitHub successfully. diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md index a0b438c9ffa..1f35faacc2e 100644 --- a/doc/integration/gitlab.md +++ b/doc/integration/gitlab.md @@ -14,7 +14,7 @@ GitLab.com generates an application ID and secret key for you to use. 1. Sign in to GitLab.com. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Applications**. +1. On the left sidebar, select **Applications**. 1. Provide the required details for **Add new application**. - Name: This can be anything. Consider something like `'s GitLab` or `'s GitLab` or something else descriptive. - Redirect URI: diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md index 9df85e61798..bafba2cdf02 100644 --- a/doc/integration/gitpod.md +++ b/doc/integration/gitpod.md @@ -48,7 +48,7 @@ For GitLab self-managed instances, a GitLab administrator needs to: to get your instance up and running. 1. Enable it in GitLab: 1. On the top bar, select **Menu > Admin**. - 1. In the left sidebar, select **Settings > General**. + 1. On the left sidebar, select **Settings > General**. 1. Expand the **Gitpod** configuration section. 1. Check the **Enable Gitpod integration** checkbox. 1. Add your Gitpod instance URL (for example, `https://gitpod.example.com`). diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index 8910e0978b0..18ae71a7059 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -74,7 +74,7 @@ Create a personal access token to authorize Jenkins' access to GitLab. 1. Sign in to GitLab as the user to be used with Jenkins. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Access Tokens**. +1. On the left sidebar, select **Access Tokens**. 1. Create a personal access token with the **API** scope checkbox checked. For more details, see [Personal access tokens](../user/profile/personal_access_tokens.md). 1. Record the personal access token's value, because it's required in [Configure the Jenkins server](#configure-the-jenkins-server) section. diff --git a/doc/integration/jira/dvcs.md b/doc/integration/jira/dvcs.md index 0c2dfd2b92e..0a136237ba5 100644 --- a/doc/integration/jira/dvcs.md +++ b/doc/integration/jira/dvcs.md @@ -71,14 +71,14 @@ maintenance does not affect your integration. this user must have an [Administrator](../../user/permissions.md) role. 1. Sign in as the `jira` user. 1. In the top right corner, click the account's avatar, and select **Edit profile**. -1. In the left sidebar, select **Applications**. +1. On the left sidebar, select **Applications**. 1. In the **Name** field, enter a descriptive name for the integration, such as `Jira`. 1. In the **Redirect URI** field, enter the URI appropriate for your version of GitLab, replacing `` with your GitLab instance domain: - *For GitLab versions 13.0 and later* **and** *Jira versions 8.14 and later,* use the generated `Redirect URL` from [Linking GitLab accounts with Jira](https://confluence.atlassian.com/adminjiraserver/linking-gitlab-accounts-1027142272.html). - - *For GitLab versions 13.0 and later* **and** *Jira Cloud,* use `https:///login/oauth/callback`. + - *For GitLab versions 13.0 and later* **and** *Jira Cloud,* use `https:///login/oauth/callback`. - *For GitLab versions 11.3 and later* **and** *Jira versions 8.13 and earlier,* use `https:///login/oauth/callback`. If you use GitLab.com, the URL is `https://gitlab.com/login/oauth/callback`. - *For GitLab versions 11.2 and earlier,* use diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md index de71b88666a..d4c0f6402cb 100644 --- a/doc/integration/kerberos.md +++ b/doc/integration/kerberos.md @@ -118,7 +118,7 @@ If you're not an administrator: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. In the **Social sign-in** section, select **Connect Kerberos SPNEGO**. If you don't see a **Social sign-in** Kerberos option, follow the requirements in [Enable single sign-on](#enable-single-sign-on). diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index b7578a452ea..5df6c4f28b7 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -48,7 +48,7 @@ To add a new application for your user: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Applications**. +1. On the left sidebar, select **Applications**. 1. Enter a **Name**, **Redirect URI** and OAuth 2 scopes as defined in [Authorized Applications](#authorized-applications). The **Redirect URI** is the URL where users are sent after they authorize with GitLab. 1. Select **Save application**. GitLab provides: diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 2ed7218cabb..7dc775c2557 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -153,7 +153,7 @@ OmniAuth provider for an existing user. 1. Sign in normally - whether standard sign in, LDAP, or another OmniAuth provider. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. In the **Connected Accounts** section, select the desired OmniAuth provider, such as Twitter. 1. The user is redirected to the provider. After the user authorizes GitLab, they are redirected back to GitLab. @@ -270,7 +270,7 @@ By default, **Sign In** is enabled by using all the OAuth Providers that have be To enable/disable an OmniAuth provider: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, go to **Settings**. +1. On the left sidebar, go to **Settings**. 1. Scroll to the **Sign-in Restrictions** section, and click **Expand**. 1. Below **Enabled OAuth Sign-In sources**, select the checkbox for each provider you want to enable or disable. diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md index 42c1722b69b..6f0027aedc7 100644 --- a/doc/integration/sourcegraph.md +++ b/doc/integration/sourcegraph.md @@ -77,7 +77,7 @@ You can skip this step if you already have your GitLab repositories searchable i ### Configure your GitLab instance with Sourcegraph 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Sourcegraph** configuration section. 1. Check **Enable Sourcegraph**. 1. Set the Sourcegraph URL to your Sourcegraph instance, such as `https://sourcegraph.example.com`. diff --git a/doc/integration/trello_power_up.md b/doc/integration/trello_power_up.md index df1d9270bd5..96150440e53 100644 --- a/doc/integration/trello_power_up.md +++ b/doc/integration/trello_power_up.md @@ -42,7 +42,7 @@ To find it in GitLab: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Access Tokens**. +1. On the left sidebar, select **Access Tokens**. Learn more about generating a personal access token in the [Personal Access Token Documentation](../user/profile/personal_access_tokens.md). diff --git a/doc/integration/vault.md b/doc/integration/vault.md index c98990bcb0e..ebfa91c7516 100644 --- a/doc/integration/vault.md +++ b/doc/integration/vault.md @@ -23,7 +23,7 @@ The following assumes you already have Vault installed and running. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. - 1. In the left sidebar, select **Applications**. + 1. On the left sidebar, select **Applications**. 1. Fill out the application **Name** and [**Redirect URI**](https://www.vaultproject.io/docs/auth/jwt#redirect-uris). 1. Select the **OpenID** scope. 1. Select **Save application**. -- cgit v1.2.3