Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index eba4ebb4b6e..74051f2d69f 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -486,6 +486,12 @@ module API
               name: :jira_issue_transition_id,
               type: String,
               desc: '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`'
+            },
+            {
+              required: false,
+              name: :comment_on_event_enabled,
+              type: Boolean,
+              desc: 'Enable comments inside Jira issues on each GitLab event (commit / merge request)'
             }
           ],
           'mattermost-slash-commands' => [