Unverified Commit ccd3045b authored by Brian Krische's avatar Brian Krische Committed by GitHub
Browse files

Fix serialization error with new params. (#524)

parent eef6ec81
...@@ -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));
} }
......
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