Commit 7a36091f authored by bitsofinfo's avatar bitsofinfo
parent e19011d1
...@@ -126,6 +126,8 @@ public class GitlabAPI { ...@@ -126,6 +126,8 @@ public class GitlabAPI {
* @param bio * @param bio
* @param isAdmin * @param isAdmin
* @param can_create_group * @param can_create_group
* @param skip_confirmation
*
* @return * @return
* @throws IOException * @throws IOException
*/ */
...@@ -133,10 +135,12 @@ public class GitlabAPI { ...@@ -133,10 +135,12 @@ public class GitlabAPI {
String fullName, String skypeId, String linkedIn, String fullName, String skypeId, String linkedIn,
String twitter, String website_url, Integer projects_limit, String twitter, String website_url, Integer projects_limit,
String extern_uid, String extern_provider_name, String extern_uid, String extern_provider_name,
String bio, Boolean isAdmin, Boolean can_create_group) throws IOException { String bio, Boolean isAdmin, Boolean can_create_group,
Boolean skip_confirmation) throws IOException {
Query query = new Query() Query query = new Query()
.append("email", email) .append("email", email)
.appendIf("skip_confirmation", skip_confirmation)
.appendIf("password", password) .appendIf("password", password)
.appendIf("username", username) .appendIf("username", username)
.appendIf("name", fullName) .appendIf("name", fullName)
...@@ -176,6 +180,8 @@ public class GitlabAPI { ...@@ -176,6 +180,8 @@ public class GitlabAPI {
* @param bio * @param bio
* @param isAdmin * @param isAdmin
* @param can_create_group * @param can_create_group
* @param skip_confirmation
*
* @return * @return
* @throws IOException * @throws IOException
*/ */
...@@ -184,10 +190,12 @@ public class GitlabAPI { ...@@ -184,10 +190,12 @@ public class GitlabAPI {
String fullName, String skypeId, String linkedIn, String fullName, String skypeId, String linkedIn,
String twitter, String website_url, Integer projects_limit, String twitter, String website_url, Integer projects_limit,
String extern_uid, String extern_provider_name, String extern_uid, String extern_provider_name,
String bio, Boolean isAdmin, Boolean can_create_group) throws IOException { String bio, Boolean isAdmin, Boolean can_create_group,
Boolean skip_confirmation) throws IOException {
Query query = new Query() Query query = new Query()
.append("email", email) .append("email", email)
.appendIf("skip_confirmation", skip_confirmation)
.appendIf("password", password) .appendIf("password", password)
.appendIf("username", username) .appendIf("username", username)
.appendIf("name", fullName) .appendIf("name", fullName)
......
...@@ -64,6 +64,7 @@ public class GitlabAPITest { ...@@ -64,6 +64,7 @@ public class GitlabAPITest {
randVal("externprovidername"), randVal("externprovidername"),
randVal("bio"), randVal("bio"),
false, false,
false,
false); false);
Assert.assertNotNull(gitUser); Assert.assertNotNull(gitUser);
...@@ -76,7 +77,7 @@ public class GitlabAPITest { ...@@ -76,7 +77,7 @@ public class GitlabAPITest {
_api.updateUser(gitUser.getId(), gitUser.getEmail(), password , gitUser.getUsername(), _api.updateUser(gitUser.getId(), gitUser.getEmail(), password , gitUser.getUsername(),
gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(), gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(),
10 /* project limit does not come back on GET */, gitUser.getExternUid(), gitUser.getExternProviderName(), 10 /* project limit does not come back on GET */, gitUser.getExternUid(), gitUser.getExternProviderName(),
gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup()); gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup(), false);
GitlabUser postUpdate = _api.getUserViaSudo(gitUser.getUsername()); GitlabUser postUpdate = _api.getUserViaSudo(gitUser.getUsername());
......
Markdown is supported
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