Commit b5685c37 authored by Greg Messner's avatar Greg Messner
Browse files

Added support for last_activity_on and shared_runners_minutes_limit.

parent 025cc30f
...@@ -22,6 +22,7 @@ public class AbstractUser { ...@@ -22,6 +22,7 @@ public class AbstractUser {
private Integer id; private Integer id;
private List<Identity> identities; private List<Identity> identities;
private Boolean isAdmin; private Boolean isAdmin;
private Date lastActivityOn;
private Date lastSignInAt; private Date lastSignInAt;
private String linkedin; private String linkedin;
private String location; private String location;
...@@ -29,6 +30,7 @@ public class AbstractUser { ...@@ -29,6 +30,7 @@ public class AbstractUser {
private String organization; private String organization;
private Integer projectsLimit; private Integer projectsLimit;
private String provider; private String provider;
private Integer sharedRunnersMinutesLimit;
private String skype; private String skype;
private String state; private String state;
private Integer themeId; private Integer themeId;
...@@ -142,6 +144,14 @@ public class AbstractUser { ...@@ -142,6 +144,14 @@ public class AbstractUser {
this.isAdmin = isAdmin; this.isAdmin = isAdmin;
} }
public Date getLastActivityOn() {
return lastActivityOn;
}
public void setLastActivityOn(Date lastActivityOn) {
this.lastActivityOn = lastActivityOn;
}
public Date getLastSignInAt() { public Date getLastSignInAt() {
return lastSignInAt; return lastSignInAt;
} }
...@@ -198,6 +208,14 @@ public class AbstractUser { ...@@ -198,6 +208,14 @@ public class AbstractUser {
this.provider = provider; this.provider = provider;
} }
public Integer getSharedRunnersMinutesLimit() {
return sharedRunnersMinutesLimit;
}
public void setSharedRunnersMinutesLimit(Integer sharedRunnersMinutesLimit) {
this.sharedRunnersMinutesLimit = sharedRunnersMinutesLimit;
}
public String getSkype() { public String getSkype() {
return skype; return skype;
} }
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"organization": "", "organization": "",
"last_sign_in_at": "2012-06-01T11:41:01Z", "last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z", "confirmed_at": "2012-05-23T09:05:22Z",
"last_activity_on": "2012-05-23T07:00:00Z",
"theme_id": 1, "theme_id": 1,
"color_scheme_id": 2, "color_scheme_id": 2,
"projects_limit": 100, "projects_limit": 100,
...@@ -27,5 +28,6 @@ ...@@ -27,5 +28,6 @@
"can_create_group": true, "can_create_group": true,
"can_create_project": true, "can_create_project": true,
"two_factor_enabled": true, "two_factor_enabled": true,
"external": false "external": false,
"shared_runners_minutes_limit": 133
} }
\ No newline at end of file
Supports Markdown
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