summaryrefslogtreecommitdiff
path: root/doc/user/project/integrations/jira.md
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 10:31:33 +0200
commit00b00f1edee71d236b0cd5b796bb68f15142911f (patch)
tree471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /doc/user/project/integrations/jira.md
parentf4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff)
parentdd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff)
downloadgitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'doc/user/project/integrations/jira.md')
-rw-r--r--doc/user/project/integrations/jira.md3
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). |