Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-05 09:08:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-05 09:08:15 +0300
commitdfebbcd6b1e2fc7584d9cca1b982f5f12bd648cb (patch)
treed3331b6543a5d0c3cae9bc2b36a189b2052062b4 /doc
parent0b320988a8c4fee1c92e78cd46c6dd11c6af7e18 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/jira/dvcs/index.md15
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/integration/jira/dvcs/index.md b/doc/integration/jira/dvcs/index.md
index 80666a2d9f9..3ebbc9a921d 100644
--- a/doc/integration/jira/dvcs/index.md
+++ b/doc/integration/jira/dvcs/index.md
@@ -51,15 +51,12 @@ To configure Jira for DVCS:
1. On the top bar, in the upper-right corner, select **Administration** (**{settings}**) > **Applications**.
1. On the left sidebar, select **DVCS accounts**.
-1. To create a new integration, for **Host**, select **GitLab** or **GitLab Self-Managed**.
-1. For **Team or User Account**, enter the relative path of a top-level GitLab group that [the GitLab user](#create-a-gitlab-application-for-dvcs) can access.
-1. In the **Host URL** text box, enter the appropriate URL.
- Replace `<gitlab.example.com>` with your GitLab instance domain.
- Use `https://<gitlab.example.com>`.
-1. For **Client ID**, use the [**Application ID** value](#create-a-gitlab-application-for-dvcs).
-1. For **Client Secret**, use the [**Secret** value](#create-a-gitlab-application-for-dvcs).
-1. Ensure that all other checkboxes are selected.
-1. To create the DVCS account, select **Add**, then **Continue**.
+1. From the **Host** dropdown list, select **GitLab** or **GitLab Self-Managed**.
+1. For **Team or User Account**, enter the relative path of a [top-level GitLab group](#create-a-gitlab-application-for-dvcs) the GitLab user can access.
+1. For **Host URL**, enter the domain of your GitLab instance.
+1. From the **Client Configuration** dropdown list, select the [application link](#create-a-gitlab-application-for-dvcs) you've created.
+1. Optional. Select or clear the **Auto Link New Repositories** and **Enable Smart Commits** checkboxes.
+1. Select **Add**, then **Continue**.
Jira redirects to GitLab where you have to confirm the authorization. GitLab then redirects back to Jira
where the synced projects are displayed in the new account. The initial sync takes a few minutes.