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
7727130e
Commit
7727130e
authored
Jan 14, 2020
by
Greg Messner
Browse files
Fixed missing discussionId in resolveMergeRequestDiscussion() (#495)
parent
dbdb6ec5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/DiscussionsApi.java
View file @
7727130e
...
@@ -337,7 +337,7 @@ public class DiscussionsApi extends AbstractApi {
...
@@ -337,7 +337,7 @@ public class DiscussionsApi extends AbstractApi {
/**
/**
* Resolve or unresolve whole discussion of a merge request.
* Resolve or unresolve whole discussion of a merge request.
*
*
* <pre><code>GitLab Endpoint: P
OS
T /projects/:id/merge_requests/:merge_request_iid/discussions</code></pre>
* <pre><code>GitLab Endpoint: P
U
T /projects/:id/merge_requests/:merge_request_iid/discussions
/:discussion_id
</code></pre>
*
*
* @param projectIdOrPath projectIdOrPath the project in the form of an Integer(ID), String(path), or Project instance
* @param projectIdOrPath projectIdOrPath the project in the form of an Integer(ID), String(path), or Project instance
* @param mergeRequestIid mergeRequestIid the internal ID of the merge request
* @param mergeRequestIid mergeRequestIid the internal ID of the merge request
...
@@ -350,7 +350,7 @@ public class DiscussionsApi extends AbstractApi {
...
@@ -350,7 +350,7 @@ public class DiscussionsApi extends AbstractApi {
String
discussionId
,
Boolean
resolved
)
throws
GitLabApiException
{
String
discussionId
,
Boolean
resolved
)
throws
GitLabApiException
{
GitLabApiForm
formData
=
new
GitLabApiForm
().
withParam
(
"resolved"
,
resolved
,
true
);
GitLabApiForm
formData
=
new
GitLabApiForm
().
withParam
(
"resolved"
,
resolved
,
true
);
Response
response
=
put
(
Response
.
Status
.
OK
,
formData
.
asMap
(),
Response
response
=
put
(
Response
.
Status
.
OK
,
formData
.
asMap
(),
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"merge_requests"
,
mergeRequestIid
,
"discussions"
);
"projects"
,
getProjectIdOrPath
(
projectIdOrPath
),
"merge_requests"
,
mergeRequestIid
,
"discussions"
,
discussionId
);
return
(
response
.
readEntity
(
Discussion
.
class
));
return
(
response
.
readEntity
(
Discussion
.
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