diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-26 14:42:19 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-26 14:42:19 +0000 |
commit | 2eb3a40567ba63015e2cdcb2ce2fa762c367fe05 (patch) | |
tree | aac8499b26d5f5d5eb29355a1f5b34e7a9a1aae5 /doc | |
parent | 324af4ac9a1de224236bb0d54d5bd297fb9857ba (diff) | |
parent | 6c17e4f04d06921f8f61bc6aad0ea398dad194f0 (diff) | |
download | gitlab-ce-2eb3a40567ba63015e2cdcb2ce2fa762c367fe05.tar.gz |
Merge branch '31448-jira-urls' into 'master'
Add API URL to JIRA settings
Closes #31448
See merge request !11707
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/integrations/jira.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index f611029afdc..a048260b033 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -97,7 +97,8 @@ in the table below. | Field | Description | | ----- | ----------- | -| `URL` | The base URL to the JIRA project which is being linked to this GitLab project. E.g., `https://jira.example.com`. | +| `Web URL` | The base URL to the JIRA instance web interface which is being linked to this GitLab project. E.g., `https://jira.example.com`. | +| `JIRA API URL` | The base URL to the JIRA instance API. Web URL value will be used if not set. E.g., `https://jira-api.example.com`. | | `Project key` | The short identifier for your JIRA project, all uppercase, e.g., `PROJ`. | | `Username` | The user name created in [configuring JIRA step](#configuring-jira). | | `Password` |The password of the user created in [configuring JIRA step](#configuring-jira). | |