Merge branch 'master' into ce-issue_6538ce-issue_6538

1 files changed, 40 insertions, 0 deletions

diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index 8582c45798f..953be7f3798 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 module API
@@ -386,6 +387,44 @@ module API
             },
             chat_notification_events
           ].flatten,
+          'hipchat' => [
+            {
+              required: true,
+              name: :token,
+              type: String,
+              desc: 'The room token'
+            },
+            {
+              required: false,
+              name: :room,
+              type: String,
+              desc: 'The room name or ID'
+            },
+            {
+              required: false,
+              name: :color,
+              type: String,
+              desc: 'The room color'
+            },
+            {
+              required: false,
+              name: :notify,
+              type: Boolean,
+              desc: 'Enable notifications'
+            },
+            {
+              required: false,
+              name: :api_version,
+              type: String,
+              desc: 'Leave blank for default (v2)'
+            },
+            {
+              required: false,
+              name: :server,
+              type: String,
+              desc: 'Leave blank for default. https://hipchat.example.com'
+            }
+          ],
           'irker' => [
             {
               required: true,
@@ -690,6 +729,7 @@ module API
           ::ExternalWikiService,
           ::FlowdockService,
           ::HangoutsChatService,
+          ::HipchatService,
           ::IrkerService,
           ::JiraService,
           ::KubernetesService,