diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:16:27 +0200 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2017-07-09 09:16:27 +0200 |
| commit | 67d9a8989b76af25fca1b5f0f82c4af5e81332eb (patch) | |
| tree | c3a370fe5e963964b2de7fd73f5a0b15f8432944 /gitlab/v4/objects.py | |
| parent | cb8c1a198276cc6aa2a3ddbf52bcc3866418e9fd (diff) | |
| download | gitlab-67d9a8989b76af25fca1b5f0f82c4af5e81332eb.tar.gz | |
Fix merge_when_build_succeeds attribute name
Fixes #285
Diffstat (limited to 'gitlab/v4/objects.py')
| -rw-r--r-- | gitlab/v4/objects.py | 10 |
1 files changed, 5 insertions, 5 deletions
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, |
