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
498e439d
Commit
498e439d
authored
Jul 29, 2021
by
Etienne Baqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Exposed created_at to billable members API
Changelog: added EE: true
parent
6ac1e277
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
doc/api/members.md
doc/api/members.md
+6
-3
ee/lib/ee/api/entities/billable_member.rb
ee/lib/ee/api/entities/billable_member.rb
+1
-0
ee/spec/lib/ee/api/entities/billable_member_spec.rb
ee/spec/lib/ee/api/entities/billable_member_spec.rb
+4
-0
No files found.
doc/api/members.md
View file @
498e439d
...
@@ -292,7 +292,8 @@ Example response:
...
@@ -292,7 +292,8 @@ Example response:
"web_url"
:
"http://192.168.1.8:3000/root"
,
"web_url"
:
"http://192.168.1.8:3000/root"
,
"last_activity_on"
:
"2021-01-27"
,
"last_activity_on"
:
"2021-01-27"
,
"membership_type"
:
"group_member"
,
"membership_type"
:
"group_member"
,
"removable"
:
true
"removable"
:
true
,
"created_at"
:
"2021-01-03T12:16:02.000Z"
},
},
{
{
"id"
:
2
,
"id"
:
2
,
...
@@ -304,7 +305,8 @@ Example response:
...
@@ -304,7 +305,8 @@ Example response:
"email"
:
"john@example.com"
,
"email"
:
"john@example.com"
,
"last_activity_on"
:
"2021-01-25"
,
"last_activity_on"
:
"2021-01-25"
,
"membership_type"
:
"group_member"
,
"membership_type"
:
"group_member"
,
"removable"
:
true
"removable"
:
true
,
"created_at"
:
"2021-01-04T18:46:42.000Z"
},
},
{
{
"id"
:
3
,
"id"
:
3
,
...
@@ -315,7 +317,8 @@ Example response:
...
@@ -315,7 +317,8 @@ Example response:
"web_url"
:
"http://192.168.1.8:3000/root"
,
"web_url"
:
"http://192.168.1.8:3000/root"
,
"last_activity_on"
:
"2021-01-20"
,
"last_activity_on"
:
"2021-01-20"
,
"membership_type"
:
"group_invite"
,
"membership_type"
:
"group_invite"
,
"removable"
:
false
"removable"
:
false
,
"created_at"
:
"2021-01-09T07:12:31.000Z"
}
}
]
]
```
```
...
...
ee/lib/ee/api/entities/billable_member.rb
View file @
498e439d
...
@@ -8,6 +8,7 @@ module EE
...
@@ -8,6 +8,7 @@ module EE
expose
:last_activity_on
expose
:last_activity_on
expose
:membership_type
expose
:membership_type
expose
:removable
expose
:removable
expose
:created_at
private
private
...
...
ee/spec/lib/ee/api/entities/billable_member_spec.rb
View file @
498e439d
...
@@ -21,6 +21,10 @@ RSpec.describe ::EE::API::Entities::BillableMember do
...
@@ -21,6 +21,10 @@ RSpec.describe ::EE::API::Entities::BillableMember do
expect
(
entity_representation
[
:last_activity_on
]).
to
eq
last_activity_on
expect
(
entity_representation
[
:last_activity_on
]).
to
eq
last_activity_on
end
end
it
'exposes the created_at field'
do
expect
(
entity_representation
[
:created_at
]).
to
eq
(
member
.
created_at
)
end
context
'when the user has a public_email assigned'
do
context
'when the user has a public_email assigned'
do
let
(
:public_email
)
{
'public@email.com'
}
let
(
:public_email
)
{
'public@email.com'
}
...
...
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