Commit da1d02bd authored by serenafang's avatar serenafang

Move expires at back to group member data

parent 4b5ef5bf
...@@ -24,8 +24,7 @@ module Gitlab ...@@ -24,8 +24,7 @@ module Gitlab
def timestamps_data def timestamps_data
{ {
created_at: object.created_at&.xmlschema, created_at: object.created_at&.xmlschema,
updated_at: object.updated_at&.xmlschema, updated_at: object.updated_at&.xmlschema
expires_at: object.expires_at&.xmlschema
} }
end end
......
...@@ -41,7 +41,8 @@ module Gitlab ...@@ -41,7 +41,8 @@ module Gitlab
user_name: group_member.user.name, user_name: group_member.user.name,
user_email: group_member.user.email, user_email: group_member.user.email,
user_id: group_member.user.id, 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 end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment