diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-22 11:26:29 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-22 11:26:29 +0300 |
| commit | e922750e89fde40d9f3c465d7b1f380943c464e3 (patch) | |
| tree | 32858c902c3f356e0ce89075ad916db3cd4879d4 /lib/api/entities.rb | |
| parent | 1bbe39452664021af90851aef8527ce5e850343e (diff) | |
| parent | 7308a9be1ea480584fad85dc5de569500fc3ceb7 (diff) | |
Merge branch 'api-shared_group_expires-at' into 'master'
API: Add shared project's expiration date
Closes #46107
See merge request gitlab-org/gitlab-ce!21104
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b6393fdef19..06262f0f991 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -91,6 +91,7 @@ module API group_link.group.name end expose :group_access, as: :group_access_level + expose :expires_at end class ProjectIdentity < Grape::Entity |