diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2017-10-24 10:40:26 +0300 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-10-24 10:40:26 +0300 |
| commit | 4fa8df677785b1945f6513ac8596637f1aa65b88 (patch) | |
| tree | ed3e3b023de6d5d4539ed90131d36b097819a98f | |
| parent | cc5ba3d907c42175b70d3374c3772d0d25d12080 (diff) | |
| download | gitlab-ce-4fa8df677785b1945f6513ac8596637f1aa65b88.tar.gz | |
Update API docs
| -rw-r--r-- | changelogs/unreleased/api-configure-jira.yml | 2 | ||||
| -rw-r--r-- | doc/api/services.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/changelogs/unreleased/api-configure-jira.yml b/changelogs/unreleased/api-configure-jira.yml index 40a644810c8..3ac52d573b0 100644 --- a/changelogs/unreleased/api-configure-jira.yml +++ b/changelogs/unreleased/api-configure-jira.yml @@ -1,5 +1,5 @@ --- title: Validate username/pw for Jiraservice, require them in the API -merge_request: +merge_request: 15025 author: Robert Schilling type: fixed diff --git a/doc/api/services.md b/doc/api/services.md index 49b87a4228c..6c8f196fd5c 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -478,8 +478,8 @@ PUT /projects/:id/services/jira | --------- | ---- | -------- | ----------- | | `url` | string | yes | The URL to the JIRA project which is being linked to this GitLab project, e.g., `https://jira.example.com`. | | `project_key` | string | yes | The short identifier for your JIRA project, all uppercase, e.g., `PROJ`. | -| `username` | string | no | The username of the user created to be used with GitLab/JIRA. | -| `password` | string | no | The password 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. | | `jira_issue_transition_id` | integer | no | The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`. | ### Delete JIRA service |