Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-30 00:09:08 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-30 00:09:08 +0300
commit12c766c77475bb96d18846546d5af909c648830d (patch)
tree3f76983dfe47f001cd5eb48fe9fedc017120200b /doc/api/services.md
parent5b2abea8db1916c96027ce3a48e797003316e557 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/services.md')
-rw-r--r--doc/api/services.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/api/services.md b/doc/api/services.md
index a5fd465f2ac..189dfc48cd5 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -814,7 +814,8 @@ Parameters:
| `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). |
-| `jira_issue_transition_id` | string | 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. By default, this ID is set to `2`. |
+| `jira_issue_transition_automatic` | boolean | no | Enable [automatic issue transitions](../user/project/integrations/jira.md#automatic-issue-transitions). Takes precedence over `jira_issue_transition_id` if enabled. Defaults to `false` |
+| `jira_issue_transition_id` | string | no | The ID of one or more transitions for [custom issue transitions](../user/project/integrations/jira.md#custom-issue-transitions). Ignored if `jira_issue_transition_automatic` is enabled. Defaults to a blank string, which disables custom transitions. |
| `commit_events` | boolean | false | Enable notifications for commit events |
| `merge_requests_events` | boolean | false | Enable notifications for merge request events |
| `comment_on_event_enabled` | boolean | false | Enable comments inside Jira issues on each GitLab event (commit / merge request) |