diff options
| -rw-r--r-- | gitlab/v3/objects.py | 10 | ||||
| -rw-r--r-- | gitlab/v4/objects.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py index 84b9cb5..65015fc 100644 --- a/gitlab/v3/objects.py +++ b/gitlab/v3/objects.py @@ -1286,7 +1286,7 @@ class ProjectMergeRequest(GitlabObject): def merge(self, merge_commit_message=None, should_remove_source_branch=False, - merged_when_build_succeeds=False, + merge_when_build_succeeds=False, **kwargs): """Accept the merge request. @@ -1294,8 +1294,8 @@ class ProjectMergeRequest(GitlabObject): merge_commit_message (bool): Commit message should_remove_source_branch (bool): If True, removes the source branch - merged_when_build_succeeds (bool): Wait for the build to succeed, - then merge + merge_when_build_succeeds (bool): Wait for the build to succeed, + then merge Returns: ProjectMergeRequest: The updated MR @@ -1312,8 +1312,8 @@ class ProjectMergeRequest(GitlabObject): data['merge_commit_message'] = merge_commit_message if should_remove_source_branch: data['should_remove_source_branch'] = True - if merged_when_build_succeeds: - data['merged_when_build_succeeds'] = True + if merge_when_build_succeeds: + data['merge_when_build_succeeds'] = True r = self.gitlab._raw_put(url, data=data, **kwargs) errors = {401: GitlabMRForbiddenError, diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 01c453f..89321c9 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -1244,7 +1244,7 @@ class ProjectMergeRequest(GitlabObject): def merge(self, merge_commit_message=None, should_remove_source_branch=False, - merged_when_build_succeeds=False, + merge_when_pipeline_succeeds=False, **kwargs): """Accept the merge request. @@ -1252,8 +1252,8 @@ class ProjectMergeRequest(GitlabObject): merge_commit_message (bool): Commit message should_remove_source_branch (bool): If True, removes the source branch - merged_when_build_succeeds (bool): Wait for the build to succeed, - then merge + merge_when_pipeline_succeeds (bool): Wait for the build to succeed, + then merge Returns: ProjectMergeRequest: The updated MR @@ -1270,8 +1270,8 @@ class ProjectMergeRequest(GitlabObject): data['merge_commit_message'] = merge_commit_message if should_remove_source_branch: data['should_remove_source_branch'] = True - if merged_when_build_succeeds: - data['merged_when_build_succeeds'] = True + if merge_when_pipeline_succeeds: + data['merge_when_pipeline_succeeds'] = True r = self.gitlab._raw_put(url, data=data, **kwargs) errors = {401: GitlabMRForbiddenError, |