summaryrefslogtreecommitdiff
path: root/doc/web_hooks
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-14 15:55:05 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-14 15:55:05 +0000
commit1421fa962ef9aaae6b5756054644606f3543ccce (patch)
treee20f0a7fa7310b164d45b6df3a809e8dec8ad12a /doc/web_hooks
parent9c3643046b40e66a7754aabe2513ccdee292a4ef (diff)
parentbefa7a9c170327ecc4ce698f416450dc3542942c (diff)
downloadgitlab-ce-1421fa962ef9aaae6b5756054644606f3543ccce.tar.gz
Merge branch 'rs-snippet-expires-api' into 'master'
Don't remove `ProjectSnippet#expires_at` from API See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. See merge request !3144
Diffstat (limited to 'doc/web_hooks')
-rw-r--r--doc/web_hooks/web_hooks.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 87049427139..afdf1a682e2 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -582,6 +582,7 @@ X-Gitlab-Event: Note Hook
"created_at": "2015-04-09 02:40:38 UTC",
"updated_at": "2015-04-09 02:40:38 UTC",
"file_name": "test.rb",
+ "expires_at": null,
"type": "ProjectSnippet",
"visibility_level": 0
}