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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 12:10:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 12:10:19 +0300
commit133ec9237af290062aae70e6f115db69b51c88de (patch)
tree866ddeec2098e6557e4fe93941438ada45713940 /doc/integration
parentf9ad7e0c9fa576bf4d651ffe3e278750bf548400 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/external-issue-tracker.md2
-rw-r--r--doc/integration/jira/development_panel.md2
-rw-r--r--doc/integration/jira/dvcs.md2
-rw-r--r--doc/integration/jira/jira_cloud_configuration.md2
-rw-r--r--doc/integration/jira/jira_server_configuration.md2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 4e00057c4b7..e82c21947e2 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -31,7 +31,7 @@ Visit the links below for details:
- [Bugzilla](../user/project/integrations/bugzilla.md)
- [Custom Issue Tracker](../user/project/integrations/custom_issue_tracker.md)
- [Engineering Workflow Management](../user/project/integrations/ewm.md)
-- [Jira](../user/project/integrations/jira.md)
+- [Jira](../integration/jira/index.md)
- [Redmine](../user/project/integrations/redmine.md)
- [YouTrack](../user/project/integrations/youtrack.md)
diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md
index 378955f5721..3aba2e3b3a0 100644
--- a/doc/integration/jira/development_panel.md
+++ b/doc/integration/jira/development_panel.md
@@ -31,7 +31,7 @@ This integration connects all GitLab projects to projects in the Jira instance i
including the projects in its subgroups.
- A personal namespace: Connects the projects in that personal namespace to Jira.
-This differs from the [Jira integration](../../user/project/integrations/jira.md),
+This differs from the [Jira integration](index.md),
where the mapping is between one GitLab project and the entire Jira instance.
You can install both integrations to take advantage of both sets of features.
A [feature comparison](index.md#direct-feature-comparison) is available.
diff --git a/doc/integration/jira/dvcs.md b/doc/integration/jira/dvcs.md
index 5d636406446..64f01d91d2e 100644
--- a/doc/integration/jira/dvcs.md
+++ b/doc/integration/jira/dvcs.md
@@ -135,7 +135,7 @@ Problems with SSL and TLS can cause this error message:
Error obtaining access token. Cannot access https://gitlab.example.com from Jira.
```
-- The [GitLab Jira integration](../../user/project/integrations/jira.md) requires
+- The [GitLab Jira integration](index.md) requires
GitLab to connect to Jira. Any TLS issues that arise from a private certificate
authority or self-signed certificate are resolved
[on the GitLab server](https://docs.gitlab.com/omnibus/settings/ssl.html#other-certificate-authorities),
diff --git a/doc/integration/jira/jira_cloud_configuration.md b/doc/integration/jira/jira_cloud_configuration.md
index fd58b3f33f7..7b3f2bcb249 100644
--- a/doc/integration/jira/jira_cloud_configuration.md
+++ b/doc/integration/jira/jira_cloud_configuration.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Create an API token in Jira on Atlassian cloud **(FREE)**
-You need an API token to [integrate with Jira](../../user/project/integrations/jira.md)
+You need an API token to [integrate with Jira](index.md)
on Atlassian cloud. To create the API token:
1. Sign in to [`id.atlassian.com`](https://id.atlassian.com/manage-profile/security/api-tokens)
diff --git a/doc/integration/jira/jira_server_configuration.md b/doc/integration/jira/jira_server_configuration.md
index 3573a1f8b1e..21348416b73 100644
--- a/doc/integration/jira/jira_server_configuration.md
+++ b/doc/integration/jira/jira_server_configuration.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Jira Server credentials **(FREE)**
-To [integrate Jira with GitLab](../../user/project/integrations/jira.md), you must
+To [integrate Jira with GitLab](index.md), you must
create a Jira user account for your Jira projects to access projects in GitLab.
This Jira user account must have write access to your Jira projects. To create the
credentials, you must: