diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-29 13:04:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-29 13:04:16 +0000 |
| commit | f6a1a21f6f808738b3caccca1b1233303649f898 (patch) | |
| tree | 9c9a7da0c507ec4bdf3e0111e3a34f0d98a7a3fe /lib/api/entities.rb | |
| parent | c6a73b99df34e0a18d99e98bfc430f69327583e7 (diff) | |
| parent | 93d849beaebb00dc4dcb6cb5ffa4721883e0da51 (diff) | |
| download | gitlab-ce-f6a1a21f6f808738b3caccca1b1233303649f898.tar.gz | |
Merge branch 'issue_22382' into 'master'
Expose project share expiration_date field on API
closes #22382
See merge request !6484
Diffstat (limited to 'lib/api/entities.rb')
| -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 409a4c7cc07..c5dc8b22f60 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -343,7 +343,7 @@ module API end class ProjectGroupLink < Grape::Entity - expose :id, :project_id, :group_id, :group_access + expose :id, :project_id, :group_id, :group_access, :expires_at end class Todo < Grape::Entity |