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:
commit
1423d2382a
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: 'API: Fix docs and parameters for hangouts-chat service'
|
||||||
|
merge_request: 25180
|
||||||
|
author: Robert Schilling
|
||||||
|
type: fixed
|
|
@ -412,7 +412,7 @@ Google GSuite team collaboration tool.
|
||||||
Set Hangouts Chat service for a project.
|
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]
|
>**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 Hangouts Chat service for a project.
|
||||||
|
|
||||||
```
|
```
|
||||||
DELETE /projects/:id/services/hangouts_chat
|
DELETE /projects/:id/services/hangouts-chat
|
||||||
```
|
```
|
||||||
|
|
||||||
### Get Hangouts Chat service settings
|
### Get Hangouts Chat service settings
|
||||||
|
@ -446,7 +446,7 @@ DELETE /projects/:id/services/hangouts_chat
|
||||||
Get Hangouts Chat service settings for a project.
|
Get Hangouts Chat service settings for a project.
|
||||||
|
|
||||||
```
|
```
|
||||||
GET /projects/:id/services/hangouts_chat
|
GET /projects/:id/services/hangouts-chat
|
||||||
```
|
```
|
||||||
|
|
||||||
## Irker (IRC gateway)
|
## Irker (IRC gateway)
|
||||||
|
|
|
@ -368,8 +368,9 @@ module API
|
||||||
name: :webhook,
|
name: :webhook,
|
||||||
type: String,
|
type: String,
|
||||||
desc: 'The Hangouts Chat webhook. e.g. https://chat.googleapis.com/v1/spaces…'
|
desc: 'The Hangouts Chat webhook. e.g. https://chat.googleapis.com/v1/spaces…'
|
||||||
}
|
},
|
||||||
],
|
CHAT_NOTIFICATION_EVENTS
|
||||||
|
].flatten,
|
||||||
'irker' => [
|
'irker' => [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
|
|
Loading…
Reference in New Issue