Commit a80d2ad9 authored by Mike Lewis's avatar Mike Lewis

Merge branch 'patch-48' into 'master'

Update JIRA service API doc

See merge request gitlab-org/gitlab-ce!26435
parents d7af5ab7 41cc392d
...@@ -545,7 +545,7 @@ GET /projects/:id/services/jira ...@@ -545,7 +545,7 @@ GET /projects/:id/services/jira
Set JIRA service for a project. Set JIRA service for a project.
> Starting with GitLab 8.14, `api_url`, `issues_url`, `new_issue_url` and > 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]. > older version, [follow this documentation][old-jira-api].
``` ```
...@@ -557,7 +557,7 @@ Parameters: ...@@ -557,7 +557,7 @@ Parameters:
| Parameter | Type | Required | Description | | 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`. | | `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. | | `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. | | `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). | | `active` | boolean | no | Activates or deactivates the service. Defaults to false (deactivated). |
......
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