summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
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 /lib/api/entities.rb
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 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b1ead48caf7..5d7b8e021bb 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -213,9 +213,6 @@ module API
expose :author, using: Entities::UserBasic
expose :updated_at, :created_at
- # TODO (rspeicher): Deprecated; remove in 9.0
- expose(:expires_at) { |snippet| nil }
-
expose :web_url do |snippet, options|
Gitlab::UrlBuilder.build(snippet)
end