diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-26 11:20:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-26 11:20:48 +0000 |
| commit | c29d2c6a41518e3c00c15b6472477532ee072469 (patch) | |
| tree | e7d26cb5247b8965208c0eacc24e6993d2b65dad /doc/api | |
| parent | f913f7a1caa492fdaa06c4ebe0111a080079ff8f (diff) | |
| parent | 525f043c29dc426a025b371de08818934f757083 (diff) | |
| download | gitlab-ce-c29d2c6a41518e3c00c15b6472477532ee072469.tar.gz | |
Merge branch 'api-configure-jira' into 'master'
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/services.md | 4 |
1 files changed, 2 insertions, 2 deletions
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 |