diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-22 11:34:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-22 11:34:41 +0300 |
| commit | 9329436deb3931d28c28b41de56173ef8acd63b5 (patch) | |
| tree | 7557875233d3b506c2496599db1814afc7558c7c /lib/api/entities.rb | |
| parent | 6db65143db5003f74ddb1c9868a3d852e5661a0a (diff) | |
| parent | fb84439a92e759ff90811e98f6abf6bdbb3e6d55 (diff) | |
| download | gitlab-ce-9329436deb3931d28c28b41de56173ef8acd63b5.tar.gz | |
Merge branch 'master' into dz-merge-request-version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index fcb0b12c191..3f050a8fd81 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -97,6 +97,10 @@ module API member = options[:member] || options[:members].find { |m| m.user_id == user.id } member.access_level end + expose :expires_at do |user, options| + member = options[:member] || options[:members].find { |m| m.user_id == user.id } + member.expires_at + end end class AccessRequester < UserBasic |