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
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration/jira/dvcs/index.md')
-rw-r--r--doc/integration/jira/dvcs/index.md28
1 files changed, 15 insertions, 13 deletions
diff --git a/doc/integration/jira/dvcs/index.md b/doc/integration/jira/dvcs/index.md
index 0406fef3f1e..3ebbc9a921d 100644
--- a/doc/integration/jira/dvcs/index.md
+++ b/doc/integration/jira/dvcs/index.md
@@ -49,16 +49,14 @@ To create a GitLab application for DVCS:
To configure Jira for DVCS:
-1. Go to your DVCS account. **For Jira Server**, select **Settings (gear) > Applications > 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. On the top bar, in the upper-right corner, select **Administration** (**{settings}**) > **Applications**.
+1. On the left sidebar, select **DVCS accounts**.
+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.
@@ -72,6 +70,10 @@ personal namespaces, repeat the previous steps with additional Jira DVCS account
Jira imports commits and branches for GitLab projects every 60 minutes. To refresh the data manually in Jira:
1. Sign in to your Jira instance as the user you configured the integration with.
-1. Go to **Settings (gear) > Applications**.
-1. Select **DVCS accounts**.
-1. In the **Last activity** column, next to the repository you want to refresh, select **Refresh** (**{retry}**).
+1. On the top bar, in the upper-right corner, select **Administration** (**{settings}**) > **Applications**.
+1. On the left sidebar, select **DVCS accounts**.
+1. To refresh one or more repositories in a DVCS account:
+ - **For all repositories**, next to the account, select the ellipsis (**{ellipsis_h}**) > **Refresh repositories**.
+ - **For a single repository**:
+ 1. Select the account.
+ 1. Hover over the repository you want to refresh, and in the **Last activity** column, select **Click to sync repository** (**{retry}**).