summaryrefslogtreecommitdiff
path: root/doc/api/services.md
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-04-17 16:11:30 +0000
committerMike Lewis <mlewis@gitlab.com>2019-04-17 16:11:30 +0000
commita80d2ad9e8bebd7ae02d3ce55c777b5662df1615 (patch)
tree3a44980fcc97b61e9e56048607453209994f1eed /doc/api/services.md
parentd7af5ab7d49a6190d4741aac4764bdc3c6973599 (diff)
parent41cc392deb821fdbf327d9867e6990e909949129 (diff)
downloadgitlab-ce-a80d2ad9e8bebd7ae02d3ce55c777b5662df1615.tar.gz
Merge branch 'patch-48' into 'master'
Update JIRA service API doc See merge request gitlab-org/gitlab-ce!26435
Diffstat (limited to 'doc/api/services.md')
-rw-r--r--doc/api/services.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/services.md b/doc/api/services.md
index e8ae7ff78f4..742abccb69e 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -545,7 +545,7 @@ GET /projects/:id/services/jira
Set JIRA service for a project.
> Starting with GitLab 8.14, `api_url`, `issues_url`, `new_issue_url` and
-> `project_url` are replaced by `project_key`, `url`. If you are using an
+> `project_url` are replaced by `url`. If you are using an
> older version, [follow this documentation][old-jira-api].
```
@@ -557,7 +557,7 @@ Parameters:
| Parameter | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
| `url` | string | yes | The URL to the JIRA project which is being linked to this GitLab project. For example, `https://jira.example.com`. |
-| `project_key` | string | yes | The short identifier for your JIRA project, all uppercase, e.g., `PROJ`. |
+| `api_url` | string | no | The base URL to the JIRA instance API. Web URL value will be used if not set. For example, `https://jira-api.example.com`. |
| `username` | string | yes | The username of the user created to be used with GitLab/JIRA. |
| `password` | string | yes | The password of the user created to be used with GitLab/JIRA. |
| `active` | boolean | no | Activates or deactivates the service. Defaults to false (deactivated). |