Commit 0c030633 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'dwainaina-jira-dvcs' into 'master'

Update Gitlab 13.0 and later and Jira 8.14 and later instructions

See merge request gitlab-org/gitlab!61109
parents 7f70787b 3fcfb15f
......@@ -18,7 +18,7 @@ are accessible.
- **Jira Cloud**: Your instance must be accessible through the internet.
- **Jira Server**: Your network must allow access to your instance.
## Smart Commits
## Smart commits
When connecting GitLab with Jira with DVCS, you can process your Jira issues using
special commands, called
......@@ -74,6 +74,9 @@ your integration.
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:
- *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 11.3 and later,* use `https://<gitlab.example.com>/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
......@@ -99,11 +102,12 @@ it completes, refreshes every 60 minutes:
- *For Jira Cloud,* go to **Settings (gear) > Products > DVCS accounts**.
1. To create a new integration, select the appropriate value for **Host**:
- *For Jira versions 8.14 and later:* Select **GitLab** or
<!-- vale gitlab.Substitutions = NO -->
**GitLab Self-Hosted**.
<!-- vale gitlab.Substitutions = YES -->
**GitLab Self-Managed**.
- *For Jira versions 8.13 and earlier:* Select **GitHub Enterprise**.
1. For **Team or User Account**, enter either:
- *For Jira versions 8.14 and later:*
- The relative path of a top-level GitLab group that you have access to.
- *For Jira versions 8.13 and earlier:*
- The relative path of a top-level GitLab group that you have access to.
- The relative path of your personal namespace.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment