summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-20 09:12:20 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-20 09:12:20 -0800
commitf9fb76670f9db5c7bf7d74fe0129129c785f8099 (patch)
tree9d6b7cea48bde597cbebae9fc0657990b58ba6f2 /doc
parent0af2a161fa55a4abd7f8248b25a7361b209ecc4a (diff)
parent4ffdb83e713b1ffa9578c02d31cfd0d9afe56ca7 (diff)
downloadgitlab-ce-f9fb76670f9db5c7bf7d74fe0129129c785f8099.tar.gz
Merge pull request #8603 from jubianchi/hook-merge-request-action
Add action property to merge request hook
Diffstat (limited to 'doc')
-rw-r--r--doc/web_hooks/web_hooks.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index e17d21b990d..e3399e5f1b8 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -166,7 +166,9 @@ Triggered when a new merge request is created or an existing merge request was u
"name": "GitLab dev user",
"email": "gitlabdev@dv6700.(none)"
}
- }
+ },
+ "url": "http://example.com/diaspora/merge_requests/1",
+ "action": "open"
}
}
```