diff options
author | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
commit | 0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (patch) | |
tree | 921c7b84db8492726b2b06baed09b5385f1f4440 /lib | |
parent | ec7804444343cef3562d88aab2d255287a215430 (diff) | |
parent | a409a77d5c5d75b02421e7d4a8a293c3469e7556 (diff) | |
download | gitlab-ce-0276b8682e37d361adbd1ac89d9ba6992f0d1b60.tar.gz |
Merge branch 'restore-hipchat' into 'master'
Revert "Remove HipChat integration from GitLab"
Closes #60042
See merge request gitlab-org/gitlab-ce!27172
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/helpers/services_helpers.rb | 40 |
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, |