summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-09 14:06:36 +0100
committerSean McGivern <sean@gitlab.com>2019-04-10 12:58:18 +0100
commitcd9ae6bb820ae8ec98cce38d958298e081860dab (patch)
tree5ae1b923e40d42392c6443e2308722bf670727f1 /lib/api
parent0de88f57997ef1d60467464f15411dae0c7ee870 (diff)
downloadgitlab-ce-cd9ae6bb820ae8ec98cce38d958298e081860dab.tar.gz
Revert "Remove HipChat integration from GitLab"
This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/helpers/services_helpers.rb40
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,