summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-02-07 13:02:56 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-02-07 13:02:56 +0000
commitf97d7769e0c70b0d4cda376d03939e2aa78d2c0e (patch)
treea0a1e8af29b64799f7a5ca937389d43bf69cc8a8 /doc
parent95a3e2da9b75ac30ff95f3bf6018d200204f6af6 (diff)
parent626e79b6f5ed18e1d023643d3e4b85dc4f20286c (diff)
downloadgitlab-ce-f97d7769e0c70b0d4cda376d03939e2aa78d2c0e.tar.gz
Merge branch 'api-remove-snippets-expires-at' into 'master'
Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
Diffstat (limited to 'doc')
-rw-r--r--doc/api/project_snippets.md1
-rw-r--r--doc/api/v3_to_v4.md2
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/api/project_snippets.md b/doc/api/project_snippets.md
index c6685f54a9d..404876f6237 100644
--- a/doc/api/project_snippets.md
+++ b/doc/api/project_snippets.md
@@ -51,7 +51,6 @@ Parameters:
"state": "active",
"created_at": "2012-05-23T08:00:58Z"
},
- "expires_at": null,
"updated_at": "2012-06-28T10:52:04Z",
"created_at": "2012-06-28T10:52:04Z",
"web_url": "http://example.com/example/example/snippets/1"
diff --git a/doc/api/v3_to_v4.md b/doc/api/v3_to_v4.md
index 9748aec17ad..8408f8e286e 100644
--- a/doc/api/v3_to_v4.md
+++ b/doc/api/v3_to_v4.md
@@ -10,4 +10,4 @@ changes are in V4:
- `iid` filter has been removed from `projects/:id/issues`
- `projects/:id/merge_requests?iid[]=x&iid[]=y` array filter has been renamed to `iids`
- Endpoints under `projects/merge_request/:id` have been removed (use: `projects/merge_requests/:id`)
-
+- Project snippets do not return deprecated field `expires_at`