summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-08 01:47:48 +0000
committerStan Hu <stanhu@gmail.com>2017-08-08 01:47:48 +0000
commitfd40bce9ccad94c3f8fe522a51a771335d95539f (patch)
tree0fb76c147480326f17fb77271628c24794255572 /doc
parent4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff)
parenta0c22d1edafbd87d59dbf01acd610da97ec87912 (diff)
downloadgitlab-ce-fd40bce9ccad94c3f8fe522a51a771335d95539f.tar.gz
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/webhooks.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index c03a2df9a72..47eb0b34f66 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -438,7 +438,6 @@ X-Gitlab-Event: Note Hook
"iid": 1,
"description": "Et voluptas corrupti assumenda temporibus. Architecto cum animi eveniet amet asperiores. Vitae numquam voluptate est natus sit et ad id.",
"position": 0,
- "locked_at": null,
"source":{
"name":"Gitlab Test",
"description":"Aut reprehenderit ut est.",