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.md')
-rw-r--r--doc/integration/jira/dvcs.md19
1 files changed, 8 insertions, 11 deletions
diff --git a/doc/integration/jira/dvcs.md b/doc/integration/jira/dvcs.md
index e69b7675a59..d35c21f6187 100644
--- a/doc/integration/jira/dvcs.md
+++ b/doc/integration/jira/dvcs.md
@@ -69,17 +69,14 @@ you can still perform multiple actions in a single commit. For example:
## Configure a GitLab application for DVCS
-We recommend you create and use a `jira` user in GitLab, and use the account
+For projects in a single group we recommend you create a [group application](../oauth_provider.md#group-owned-applications).
+For projects across multiple groups we recommend you create and use a `jira` user in GitLab, and use the account
only for integration work. A separate account ensures regular account
-maintenance does not affect your integration. If a `jira` user is not feasible,
-you can set up this integration with your own account instead.
-
-1. In GitLab, [create a user](../../user/profile/account/create_accounts.md) for Jira to
- use to connect to GitLab. This user must be added to each project you want Jira to have access to,
- or be an administrator to access all projects.
-1. Sign in as the `jira` user.
-1. On the top bar, in the top right corner, select the user's avatar, and select **Edit profile**.
-1. On the left sidebar, select **Applications**.
+maintenance does not affect your integration. If a `jira` user or group application is not feasible,
+you can set up this integration as an [instance-wide application](../oauth_provider.md#instance-wide-applications)
+or with a [user owned application](../oauth_provider.md#user-owned-applications) instead.
+
+1. Navigate to the [appropriate **Applications** section](../oauth_provider.md#introduction-to-oauth).
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 `<gitlab.example.com>` with your GitLab instance domain:
@@ -275,7 +272,7 @@ Failed to execute request [https://gitlab.com/api/v4/projects/:id/merge_requests
{"message":"403 Forbidden"}
```
-If you find a `{"message":"403 Forbidden"}` error, it is possible that this specific project has some [GitLab features disabled](../../user/project/settings/index.md#sharing-and-permissions).
+If you find a `{"message":"403 Forbidden"}` error, it is possible that this specific project has some [GitLab features disabled](../../user/project/settings/index.md#configure-project-visibility-features-and-permissions).
In the example above, the merge requests feature is disabled.
To resolve the issue, enable the relevant feature: