Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
java-gitlab-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
沈俊林
java-gitlab-api
Commits
b7f901b7
Commit
b7f901b7
authored
Aug 14, 2014
by
Tim Olshansky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #24 from bitsofinfo/master
prep support for
https://gitlab.com/gitlab-org/gitlab-ce/issues/483
parents
80e7d982
7a36091f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
GitlabAPI.java
src/main/java/org/gitlab/api/GitlabAPI.java
+10
-2
GitlabAPITest.java
src/test/java/org/gitlab/api/GitlabAPITest.java
+2
-1
No files found.
src/main/java/org/gitlab/api/GitlabAPI.java
View file @
b7f901b7
...
...
@@ -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
)
...
...
src/test/java/org/gitlab/api/GitlabAPITest.java
View file @
b7f901b7
...
...
@@ -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
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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