Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6276b9a9
Commit
6276b9a9
authored
Dec 14, 2020
by
serenafang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move expires_at to timestamp data
parent
d6825da3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/hook_data/base_builder.rb
lib/gitlab/hook_data/base_builder.rb
+2
-1
lib/gitlab/hook_data/group_member_builder.rb
lib/gitlab/hook_data/group_member_builder.rb
+1
-2
No files found.
lib/gitlab/hook_data/base_builder.rb
View file @
6276b9a9
...
...
@@ -24,7 +24,8 @@ module Gitlab
def
timestamps_data
{
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
...
...
lib/gitlab/hook_data/group_member_builder.rb
View file @
6276b9a9
...
...
@@ -41,8 +41,7 @@ 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
,
expires_at:
group_member
.
expires_at
&
.
xmlschema
group_access:
group_member
.
human_access
}
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment