diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-14 15:55:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-14 15:55:05 +0000 |
| commit | 1421fa962ef9aaae6b5756054644606f3543ccce (patch) | |
| tree | e20f0a7fa7310b164d45b6df3a809e8dec8ad12a /lib | |
| parent | 9c3643046b40e66a7754aabe2513ccdee292a4ef (diff) | |
| parent | befa7a9c170327ecc4ce698f416450dc3542942c (diff) | |
| download | gitlab-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 'lib')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5b5b8bd044b..b49af093a14 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -144,6 +144,9 @@ module API expose :id, :title, :file_name expose :author, using: Entities::UserBasic expose :updated_at, :created_at + + # TODO (rspeicher): Deprecated; remove in 9.0 + expose(:expires_at) { |snippet| nil } end class ProjectEntity < Grape::Entity |