diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-13 20:27:05 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-13 20:27:05 +0300 |
| commit | 1423d2382aa6250e37f847f33859701865535d6b (patch) | |
| tree | 8ebd077d329277cdeac219c2194162eda0d6508b | |
| parent | 3967412f7e430d5a70560da8c7d6990a0aeec029 (diff) | |
| parent | 58e1a0898af6f1381411703f0d09342b0f77dd11 (diff) | |
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
| -rw-r--r-- | changelogs/unreleased/57101-api-docs-for-hangouts-chat-service-incorrect.yml | 5 | ||||
| -rw-r--r-- | doc/api/services.md | 6 | ||||
| -rw-r--r-- | lib/api/services.rb | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/changelogs/unreleased/57101-api-docs-for-hangouts-chat-service-incorrect.yml b/changelogs/unreleased/57101-api-docs-for-hangouts-chat-service-incorrect.yml new file mode 100644 index 00000000000..2e0ae9c3732 --- /dev/null +++ b/changelogs/unreleased/57101-api-docs-for-hangouts-chat-service-incorrect.yml @@ -0,0 +1,5 @@ +--- +title: 'API: Fix docs and parameters for hangouts-chat service' +merge_request: 25180 +author: Robert Schilling +type: fixed diff --git a/doc/api/services.md b/doc/api/services.md index 2a8ce39e570..5d5aa3e5b3e 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -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) diff --git a/lib/api/services.rb b/lib/api/services.rb index 36bdba2d765..163c7505a65 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -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, |