diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-09 09:02:17 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-09 09:02:17 +0000 |
| commit | bc14d81af02f2b433692edbfc93db6fc7a31fa67 (patch) | |
| tree | 16fdf914e3c8b93671986bf31bd9dea0f9a001a6 /lib | |
| parent | c674ffe0e045e46fd0f2754b77b1042444d95388 (diff) | |
| parent | 836d5930332797192094ce4a3c8083e96f7e8c53 (diff) | |
| download | gitlab-ce-bc14d81af02f2b433692edbfc93db6fc7a31fa67.tar.gz | |
Merge branch 'rs-snippets-dont-expire' into 'master'
Remove `Snippet#expires_at`
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
See merge request !3103
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 0779fb881a0..5b5b8bd044b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -143,7 +143,7 @@ module API class ProjectSnippet < Grape::Entity expose :id, :title, :file_name expose :author, using: Entities::UserBasic - expose :expires_at, :updated_at, :created_at + expose :updated_at, :created_at end class ProjectEntity < Grape::Entity |