diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
| commit | b07852468f800d751ddecc9e327119d7295f538e (patch) | |
| tree | d1169f95ea3725d609c796a1ca87d5766646852c /lib/gitlab/hook_data | |
| parent | 0ff373dc416216d02760c7c162ee23382eb1f4a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/hook_data')
| -rw-r--r-- | lib/gitlab/hook_data/group_member_builder.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/hook_data/group_member_builder.rb b/lib/gitlab/hook_data/group_member_builder.rb index ecc83b66327..32cfd032ffe 100644 --- a/lib/gitlab/hook_data/group_member_builder.rb +++ b/lib/gitlab/hook_data/group_member_builder.rb @@ -19,6 +19,7 @@ module Gitlab # :group_access=>"Guest", # :created_at=>"2020-11-04T10:12:10Z", # :updated_at=>"2020-11-04T10:12:10Z", + # :expires_at=>"2020-12-04T10:12:10Z" # } def build(event) @@ -40,7 +41,8 @@ module Gitlab user_name: group_member.user.name, user_email: group_member.user.email, user_id: group_member.user.id, - group_access: group_member.human_access + group_access: group_member.human_access, + expires_at: group_member.expires_at&.xmlschema } end |