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
a0f5a73c
Unverified
Commit
a0f5a73c
authored
Mar 16, 2023
by
Jérémie Bresson
Committed by
GitHub
Mar 16, 2023
Browse files
Javadoc fixes (#922)
parent
a00b1f09
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/MergeRequestApi.java
View file @
a0f5a73c
...
...
@@ -739,9 +739,9 @@ public class MergeRequestApi extends AbstractApi {
*
* @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
*/
...
...
@@ -767,9 +767,9 @@ public class MergeRequestApi extends AbstractApi {
*
* @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
...
...
src/test/java/org/gitlab4j/api/HelperUtils.java
View file @
a0f5a73c
...
...
@@ -87,7 +87,7 @@ public class HelperUtils {
* 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
)
{
...
...
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