Commit fcd9261d authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

Merge remote-tracking branch 'origin/main' into 6.x

parents a7d8236d f9baa81b
...@@ -24,6 +24,7 @@ public class User extends AbstractUser<User> { ...@@ -24,6 +24,7 @@ public class User extends AbstractUser<User> {
private Date lastSignInAt; private Date lastSignInAt;
private String linkedin; private String linkedin;
private String location; private String location;
private Long namespaceId;
private String organization; private String organization;
private Boolean privateProfile; private Boolean privateProfile;
private Integer projectsLimit; private Integer projectsLimit;
...@@ -166,6 +167,14 @@ public class User extends AbstractUser<User> { ...@@ -166,6 +167,14 @@ public class User extends AbstractUser<User> {
this.location = location; this.location = location;
} }
public Long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(Long namespaceId) {
this.namespaceId = namespaceId;
}
public String getOrganization() { public String getOrganization() {
return organization; return organization;
} }
......
...@@ -34,5 +34,6 @@ ...@@ -34,5 +34,6 @@
"external": false, "external": false,
"private_profile": false, "private_profile": false,
"shared_runners_minutes_limit": 133, "shared_runners_minutes_limit": 133,
"extra_shared_runners_minutes_limit": 133 "extra_shared_runners_minutes_limit": 133,
"namespace_id": 1
} }
\ 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