Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
b5685c37
Commit
b5685c37
authored
Jun 27, 2017
by
Greg Messner
Browse files
Added support for last_activity_on and shared_runners_minutes_limit.
parent
025cc30f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/models/AbstractUser.java
View file @
b5685c37
...
...
@@ -22,6 +22,7 @@ public class AbstractUser {
private
Integer
id
;
private
List
<
Identity
>
identities
;
private
Boolean
isAdmin
;
private
Date
lastActivityOn
;
private
Date
lastSignInAt
;
private
String
linkedin
;
private
String
location
;
...
...
@@ -29,6 +30,7 @@ public class AbstractUser {
private
String
organization
;
private
Integer
projectsLimit
;
private
String
provider
;
private
Integer
sharedRunnersMinutesLimit
;
private
String
skype
;
private
String
state
;
private
Integer
themeId
;
...
...
@@ -142,6 +144,14 @@ public class AbstractUser {
this
.
isAdmin
=
isAdmin
;
}
public
Date
getLastActivityOn
()
{
return
lastActivityOn
;
}
public
void
setLastActivityOn
(
Date
lastActivityOn
)
{
this
.
lastActivityOn
=
lastActivityOn
;
}
public
Date
getLastSignInAt
()
{
return
lastSignInAt
;
}
...
...
@@ -198,6 +208,14 @@ public class AbstractUser {
this
.
provider
=
provider
;
}
public
Integer
getSharedRunnersMinutesLimit
()
{
return
sharedRunnersMinutesLimit
;
}
public
void
setSharedRunnersMinutesLimit
(
Integer
sharedRunnersMinutesLimit
)
{
this
.
sharedRunnersMinutesLimit
=
sharedRunnersMinutesLimit
;
}
public
String
getSkype
()
{
return
skype
;
}
...
...
src/test/resources/org/gitlab4j/api/user.json
View file @
b5685c37
...
...
@@ -15,6 +15,7 @@
"organization"
:
""
,
"last_sign_in_at"
:
"2012-06-01T11:41:01Z"
,
"confirmed_at"
:
"2012-05-23T09:05:22Z"
,
"last_activity_on"
:
"2012-05-23T07:00:00Z"
,
"theme_id"
:
1
,
"color_scheme_id"
:
2
,
"projects_limit"
:
100
,
...
...
@@ -27,5 +28,6 @@
"can_create_group"
:
true
,
"can_create_project"
:
true
,
"two_factor_enabled"
:
true
,
"external"
:
false
"external"
:
false
,
"shared_runners_minutes_limit"
:
133
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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