Merge branch 'hangouts_chat_integration' into 'master'

Hangouts chat integration

See merge request gitlab-org/gitlab-ce!20290

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/api/services.rb b/lib/api/services.rb
index 553e8dff4b9..1f2bf546cd7 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -368,6 +368,14 @@ module API
           desc: "The project's slug on gemnasium.com"
         }
       ],
+      'hangouts-chat' => [
+        {
+          required: true,
+          name: :webhook,
+          type: String,
+          desc: 'The Hangouts Chat webhook. e.g. https://chat.googleapis.com/v1/spaces…'
+        }
+      ],
       'hipchat' => [
         {
           required: true,
@@ -688,6 +696,7 @@ module API
       ExternalWikiService,
       FlowdockService,
       GemnasiumService,
+      HangoutsChatService,
       HipchatService,
       IrkerService,
       JiraService,