diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-19 10:34:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-20 16:54:54 +0200 |
| commit | 3fdd00afc73e05ad413be18d9cdbbe2e3c74b465 (patch) | |
| tree | 5abb5a2de31d410ea638570a2bb0faed8c08eb64 /doc | |
| parent | d2aa46b71e7060524ed47d9a1b9fbb7c6ec0127b (diff) | |
| download | gitlab-ce-3fdd00afc73e05ad413be18d9cdbbe2e3c74b465.tar.gz | |
Merge branch 'fix-system-hook-api' into 'master'
API: Fix Sytem hooks delete behavior
## What does this MR do?
This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found.
## What are the relevant issue numbers?
Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62
See merge request !6883
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/system_hooks.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/api/system_hooks.md b/doc/api/system_hooks.md index 1802fae14fe..073e99b7147 100644 --- a/doc/api/system_hooks.md +++ b/doc/api/system_hooks.md @@ -98,11 +98,8 @@ Example response: ## Delete system hook -Deletes a system hook. This is an idempotent API function and returns `200 OK` -even if the hook is not available. - -If the hook is deleted, a JSON object is returned. An error is raised if the -hook is not found. +Deletes a system hook. It returns `200 OK` if the hooks is deleted and +`404 Not Found` if the hook is not found. --- |