Commit b7f901b7 authored by Tim Olshansky's avatar Tim Olshansky

Merge pull request #24 from bitsofinfo/master

prep support for https://gitlab.com/gitlab-org/gitlab-ce/issues/483
parents 80e7d982 7a36091f
......@@ -134,6 +134,8 @@ public class GitlabAPI {
* @param bio
* @param isAdmin
* @param can_create_group
* @param skip_confirmation
*
* @return
* @throws IOException
*/
......@@ -141,10 +143,12 @@ public class GitlabAPI {
String fullName, String skypeId, String linkedIn,
String twitter, String website_url, Integer projects_limit,
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()
.append("email", email)
.appendIf("skip_confirmation", skip_confirmation)
.appendIf("password", password)
.appendIf("username", username)
.appendIf("name", fullName)
......@@ -184,6 +188,8 @@ public class GitlabAPI {
* @param bio
* @param isAdmin
* @param can_create_group
* @param skip_confirmation
*
* @return
* @throws IOException
*/
......@@ -192,10 +198,12 @@ public class GitlabAPI {
String fullName, String skypeId, String linkedIn,
String twitter, String website_url, Integer projects_limit,
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()
.append("email", email)
.appendIf("skip_confirmation", skip_confirmation)
.appendIf("password", password)
.appendIf("username", username)
.appendIf("name", fullName)
......
......@@ -64,6 +64,7 @@ public class GitlabAPITest {
randVal("externprovidername"),
randVal("bio"),
false,
false,
false);
Assert.assertNotNull(gitUser);
......@@ -76,7 +77,7 @@ public class GitlabAPITest {
_api.updateUser(gitUser.getId(), gitUser.getEmail(), password , gitUser.getUsername(),
gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(),
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());
......
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