Commit 1423d238 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

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
parents 3967412f 58e1a089
---
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.
```
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)
......
......@@ -368,8 +368,9 @@ class Services < Grape::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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment