Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
ccd3045b
Unverified
Commit
ccd3045b
authored
Mar 04, 2020
by
Brian Krische
Committed by
GitHub
Mar 04, 2020
Browse files
Fix serialization error with new params. (#524)
parent
eef6ec81
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/MergeRequestApi.java
View file @
ccd3045b
...
@@ -616,7 +616,7 @@ public class MergeRequestApi extends AbstractApi {
...
@@ -616,7 +616,7 @@ public class MergeRequestApi extends AbstractApi {
*/
*/
public
MergeRequest
acceptMergeRequest
(
Object
projectIdOrPath
,
Integer
mergeRequestIid
,
public
MergeRequest
acceptMergeRequest
(
Object
projectIdOrPath
,
Integer
mergeRequestIid
,
AcceptMergeRequestParams
params
)
throws
GitLabApiException
{
AcceptMergeRequestParams
params
)
throws
GitLabApiException
{
Response
response
=
put
(
Response
.
Status
.
OK
,
params
.
getForm
(),
"projects"
,
Response
response
=
put
(
Response
.
Status
.
OK
,
params
.
getForm
()
.
asMap
()
,
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"merge_requests"
,
mergeRequestIid
,
"merge"
);
getProjectIdOrPath
(
projectIdOrPath
),
"merge_requests"
,
mergeRequestIid
,
"merge"
);
return
(
response
.
readEntity
(
MergeRequest
.
class
));
return
(
response
.
readEntity
(
MergeRequest
.
class
));
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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