diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-31 18:10:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-31 18:10:23 +0000 |
| commit | c12c77eb256995ff5a110f0683d248c9b82c3105 (patch) | |
| tree | 979f1fd30297e696747926757a12fb5edba2b03a /doc | |
| parent | e87149a12bef96b1870777d705a6eb4bc48708af (diff) | |
| parent | 6d16feef053cc453552803885add0a2755e58399 (diff) | |
| download | gitlab-ce-c12c77eb256995ff5a110f0683d248c9b82c3105.tar.gz | |
Merge branch 'feature/improve_wiki_page_events' into 'master'
Include Wiki attributes in Wiki page events webhook
The hook data we are sending is not 100% correct (we send details of the project, but should also send details of the "ProjectWiki" attributes like URLs and repositories relative to the wiki itself).
This is a follow up to #17506
Fixes #17507
See merge request !4138
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/web_hooks/web_hooks.md | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index 0777463def5..8559b67af04 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -720,7 +720,7 @@ X-Gitlab-Event: Wiki Page Hook "description": "This is awesome", "web_url": "http://example.com/root/awesome-project", "avatar_url": null, - "git_ssh_url": "git@example.com:root/test-project.git", + "git_ssh_url": "git@example.com:root/awesome-project.git", "git_http_url": "http://example.com/root/awesome-project.git", "namespace": "root", "visibility_level": 0, @@ -731,6 +731,13 @@ X-Gitlab-Event: Wiki Page Hook "ssh_url": "git@example.com:root/awesome-project.git", "http_url": "http://example.com/root/awesome-project.git" }, + "wiki": { + "web_url": "http://example.com/root/awesome-project/wikis/home", + "git_ssh_url": "git@example.com:root/awesome-project.wiki.git", + "git_http_url": "http://example.com/root/awesome-project.wiki.git", + "path_with_namespace": "root/awesome-project.wiki", + "default_branch": "master" + }, "object_attributes": { "title": "Awesome", "content": "awesome content goes here", @@ -739,12 +746,6 @@ X-Gitlab-Event: Wiki Page Hook "slug": "awesome", "url": "http://example.com/root/awesome-project/wikis/awesome", "action": "create" - }, - "repository": { - "name": "awesome-project", - "url": "git@example.com:root/awesome-project.git", - "description": "test", - "homepage": "http://example.com/root/awesome-project" } } ``` |