Merge branch '57101-api-docs-for-hangouts-chat-service-incorrect' into 'master'

API: Fix docs and parameters for hangouts-chat service

Closes #57101

See merge request gitlab-org/gitlab-ce!25180
This commit is contained in:
Rémy Coutable 2019-02-13 17:27:05 +00:00
commit 1423d2382a
3 changed files with 11 additions and 5 deletions

View file

@ -0,0 +1,5 @@
---
title: 'API: Fix docs and parameters for hangouts-chat service'
merge_request: 25180
author: Robert Schilling
type: fixed

View file

@ -412,7 +412,7 @@ Google GSuite team collaboration tool.
Set Hangouts Chat service for a project.
```
PUT /projects/:id/services/hangouts_chat
PUT /projects/:id/services/hangouts-chat
```
>**Note:** Specific event parameters (e.g. `push_events` flag) were [introduced in v10.4][11435]
@ -438,7 +438,7 @@ Parameters:
Delete Hangouts Chat service for a project.
```
DELETE /projects/:id/services/hangouts_chat
DELETE /projects/:id/services/hangouts-chat
```
### Get Hangouts Chat service settings
@ -446,7 +446,7 @@ DELETE /projects/:id/services/hangouts_chat
Get Hangouts Chat service settings for a project.
```
GET /projects/:id/services/hangouts_chat
GET /projects/:id/services/hangouts-chat
```
## Irker (IRC gateway)

View file

@ -368,8 +368,9 @@ module API
name: :webhook,
type: String,
desc: 'The Hangouts Chat webhook. e.g. https://chat.googleapis.com/v1/spaces…'
}
],
},
CHAT_NOTIFICATION_EVENTS
].flatten,
'irker' => [
{
required: true,