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
6d16726b
Commit
6d16726b
authored
Jan 23, 2015
by
Kasper Fock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a function to accept a merge request by the api.
parent
bd680583
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
GitlabAPI.java
src/main/java/org/gitlab/api/GitlabAPI.java
+18
-0
No files found.
src/main/java/org/gitlab/api/GitlabAPI.java
View file @
6d16726b
...
@@ -514,6 +514,24 @@ public class GitlabAPI {
...
@@ -514,6 +514,24 @@ public class GitlabAPI {
return
retrieve
().
to
(
tailUrl
,
GitlabMergeRequest
.
class
);
return
retrieve
().
to
(
tailUrl
,
GitlabMergeRequest
.
class
);
}
}
/**
*
* @param project
* @param mergeRequestId
* @param mergeCommitMessage optional merge commit message. Null if not set
* @return new merge request status
* @throws IOException
*/
public
GitlabMergeRequest
acceptMergeRequest
(
GitlabProject
project
,
Integer
mergeRequestId
,
String
mergeCommitMessage
)
throws
IOException
{
String
tailUrl
=
GitlabProject
.
URL
+
"/"
+
project
.
getId
()
+
"/merge_request/"
+
mergeRequestId
+
"/merge"
;
GitlabHTTPRequestor
requestor
=
retrieve
().
method
(
"PUT"
);
requestor
.
with
(
"id"
,
project
.
getId
());
requestor
.
with
(
"merge_request_id"
,
mergeRequestId
);
if
(
mergeCommitMessage
!=
null
)
requestor
.
with
(
"merge_commit_message"
,
mergeCommitMessage
);
return
requestor
.
to
(
tailUrl
,
GitlabMergeRequest
.
class
);
}
public
List
<
GitlabNote
>
getNotes
(
GitlabMergeRequest
mergeRequest
)
throws
IOException
{
public
List
<
GitlabNote
>
getNotes
(
GitlabMergeRequest
mergeRequest
)
throws
IOException
{
String
tailUrl
=
GitlabProject
.
URL
+
"/"
+
mergeRequest
.
getProjectId
()
+
String
tailUrl
=
GitlabProject
.
URL
+
"/"
+
mergeRequest
.
getProjectId
()
+
GitlabMergeRequest
.
URL
+
"/"
+
mergeRequest
.
getId
()
+
GitlabMergeRequest
.
URL
+
"/"
+
mergeRequest
.
getId
()
+
...
...
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