Skip to content

Javadoc fixes #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2023
Merged

Javadoc fixes #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/org/gitlab4j/api/MergeRequestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,9 +739,9 @@ public MergeRequest acceptMergeRequest(Object projectIdOrPath, Long mergeRequest
*
* @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
* @param mergeRequestIid the internal ID of the merge request
* @param mergeCommitMessage, custom merge commit message, optional
* @param shouldRemoveSourceBranch, if true removes the source branch, optional
* @param mergeWhenPipelineSucceeds, if true the MR is merged when the pipeline, optional
* @param mergeCommitMessage custom merge commit message, optional
* @param shouldRemoveSourceBranch if true removes the source branch, optional
* @param mergeWhenPipelineSucceeds if true the MR is merged when the pipeline, optional
* @return the merged merge request
* @throws GitLabApiException if any exception occurs
*/
Expand All @@ -767,9 +767,9 @@ public MergeRequest acceptMergeRequest(Object projectIdOrPath, Long mergeRequest
*
* @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
* @param mergeRequestIid the internal ID of the merge request
* @param mergeCommitMessage, custom merge commit message, optional
* @param shouldRemoveSourceBranch, if true removes the source branch, optional
* @param mergeWhenPipelineSucceeds, if true the MR is merged when the pipeline, optional
* @param mergeCommitMessage custom merge commit message, optional
* @param shouldRemoveSourceBranch if true removes the source branch, optional
* @param mergeWhenPipelineSucceeds if true the MR is merged when the pipeline, optional
* @param sha if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail, optional
* @return the merged merge request
* @throws GitLabApiException if any exception occurs
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/gitlab4j/api/HelperUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static final String getProperty(String key, String defaultValue) {
* Set a named property, this will amend and overwrite properties read from the test-gitlab4j.properties file.
*
* @param key the key of the property to get
* @return the named property from the test-gitlab4j.properties file
* @param value the value of the property to get
*/
public static final void setProperty(String key, String value) {
if (value == null) {
Expand Down