Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/55109-jira-integration-api-doesn-t-respect-available-format.yml

+---
+title: 'API: Support Jira transition ID as string'
+merge_request: 24400
+author: Robert Schilling
+type: fixed

lib/api/services.rb

@@ -431,7 +431,7 @@ module API
         {
           required: false,
           name: :jira_issue_transition_id,
-          type: Integer,
+          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`'
         }
       ],

spec/support/shared_contexts/services_shared_context.rb

@@ -19,7 +19,7 @@ Service.available_services_names.each do |service|
         elsif service == 'irker' && k == :server_port
           hash.merge!(k => 1234)
         elsif service == 'jira' && k == :jira_issue_transition_id
-          hash.merge!(k => 1234)
+          hash.merge!(k => '1,2,3')
         else
           hash.merge!(k => "someword")
         end