From 05dbf8e048a8e0b98e1dce95e714bd54a3955f0d Mon Sep 17 00:00:00 2001
From: John Jarvis <jarv@gitlab.com>
Date: Thu, 11 Apr 2019 12:46:53 +0000
Subject: Merge branch 'restore-hipchat-11-9' into '11-9-stable'

[11.9] Revert "Remove HipChat integration from GitLab"

See merge request gitlab-org/gitlab-ce!27257
---
 lib/api/services.rb | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'lib/api')

diff --git a/lib/api/services.rb b/lib/api/services.rb
index bda6be51553..f52bd8c2622 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 module API
   class Services < Grape::API
@@ -371,6 +372,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,
@@ -674,6 +713,7 @@ module API
       ExternalWikiService,
       FlowdockService,
       HangoutsChatService,
+      HipchatService,
       IrkerService,
       JiraService,
       KubernetesService,
-- 
cgit v1.2.1