Commit 90ad7583 authored by Greg Messner's avatar Greg Messner
Browse files

Updated Javadoc to make it clear that the internal ID is used for merge requests (#121).

parent 35090184
...@@ -117,6 +117,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -117,6 +117,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Get information about a single merge request. * Get information about a single merge request.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* GET /projects/:id/merge_requests/:merge_request_id * GET /projects/:id/merge_requests/:merge_request_id
* *
* @param projectId the project ID of the merge request * @param projectId the project ID of the merge request
...@@ -132,6 +134,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -132,6 +134,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Get a list of merge request commits. * Get a list of merge request commits.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* GET /projects/:id/merge_requests/:merge_request_iid/commits * GET /projects/:id/merge_requests/:merge_request_iid/commits
* *
* @param projectId the project ID for the merge request * @param projectId the project ID for the merge request
...@@ -146,6 +150,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -146,6 +150,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Get a list of merge request commits. * Get a list of merge request commits.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* GET /projects/:id/merge_requests/:merge_request_iid/commits * GET /projects/:id/merge_requests/:merge_request_iid/commits
* *
* @param projectId the project ID for the merge request * @param projectId the project ID for the merge request
...@@ -164,6 +170,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -164,6 +170,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Get a Pager of merge request commits. * Get a Pager of merge request commits.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* GET /projects/:id/merge_requests/:merge_request_iid/commits * GET /projects/:id/merge_requests/:merge_request_iid/commits
* *
* @param projectId the project ID for the merge request * @param projectId the project ID for the merge request
...@@ -212,6 +220,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -212,6 +220,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Updates an existing merge request. You can change branches, title, or even close the MR. * Updates an existing merge request. You can change branches, title, or even close the MR.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid * PUT /projects/:id/merge_requests/:merge_request_iid
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -254,6 +264,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -254,6 +264,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Updates an existing merge request. You can change branches, title, or even close the MR. * Updates an existing merge request. You can change branches, title, or even close the MR.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid * PUT /projects/:id/merge_requests/:merge_request_iid
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -293,6 +305,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -293,6 +305,8 @@ public class MergeRequestApi extends AbstractApi {
/** /**
* Only for admins and project owners. Soft deletes the specified merge. * Only for admins and project owners. Soft deletes the specified merge.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* DELETE /projects/:id/merge_requests/:merge_request_iid * DELETE /projects/:id/merge_requests/:merge_request_iid
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -321,6 +335,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -321,6 +335,8 @@ public class MergeRequestApi extends AbstractApi {
* a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't * a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't
* have permissions to accept this merge request, you'll get a 401. * have permissions to accept this merge request, you'll get a 401.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid/merge * PUT /projects/:id/merge_requests/:merge_request_iid/merge
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -340,6 +356,9 @@ public class MergeRequestApi extends AbstractApi { ...@@ -340,6 +356,9 @@ public class MergeRequestApi extends AbstractApi {
* a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't * a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't
* have permissions to accept this merge request, you'll get a 401. * have permissions to accept this merge request, you'll get a 401.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request. Additionally,
* mergeWhenPipelineSucceeds sets the merge_when_build_succeeds flag for GitLab API V3.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid/merge * PUT /projects/:id/merge_requests/:merge_request_iid/merge
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -365,6 +384,9 @@ public class MergeRequestApi extends AbstractApi { ...@@ -365,6 +384,9 @@ public class MergeRequestApi extends AbstractApi {
* a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't * a 409 and the error message 'SHA does not match HEAD of source branch'. If you don't
* have permissions to accept this merge request, you'll get a 401. * have permissions to accept this merge request, you'll get a 401.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request. Additionally,
* mergeWhenPipelineSucceeds sets the merge_when_build_succeeds flag for GitLab API V3.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid/merge * PUT /projects/:id/merge_requests/:merge_request_iid/merge
* *
* @param projectId the ID of a project * @param projectId the ID of a project
...@@ -391,7 +413,9 @@ public class MergeRequestApi extends AbstractApi { ...@@ -391,7 +413,9 @@ public class MergeRequestApi extends AbstractApi {
Form formData = new GitLabApiForm() Form formData = new GitLabApiForm()
.withParam("merge_commit_message", mergeCommitMessage) .withParam("merge_commit_message", mergeCommitMessage)
.withParam("should_remove_source_branch", shouldRemoveSourceBranch) .withParam("should_remove_source_branch", shouldRemoveSourceBranch)
.withParam("merge_when_pipeline_succeeds", mergeWhenPipelineSucceeds) .withParam((isApiVersion(ApiVersion.V3) ?
"merge_when_build_succeeds" : "merge_when_pipeline_succeeds"),
mergeWhenPipelineSucceeds)
.withParam("sha", sha); .withParam("sha", sha);
Response response = put(Response.Status.OK, formData.asMap(), "projects", projectId, "merge_requests", mergeRequestIid, "merge"); Response response = put(Response.Status.OK, formData.asMap(), "projects", projectId, "merge_requests", mergeRequestIid, "merge");
...@@ -404,6 +428,8 @@ public class MergeRequestApi extends AbstractApi { ...@@ -404,6 +428,8 @@ public class MergeRequestApi extends AbstractApi {
* error message 'Method Not Allowed'. In case the merge request is not set to be merged when the * error message 'Method Not Allowed'. In case the merge request is not set to be merged when the
* pipeline succeeds, you'll also get a 406 error. * pipeline succeeds, you'll also get a 406 error.
* *
* <p>NOTE: GitLab API V4 uses IID (internal ID), V3 uses ID to identify the merge request.</p>
*
* PUT /projects/:id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds * PUT /projects/:id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds
* *
* @param projectId the ID of a project * @param projectId the ID of a project
......
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