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:19:02 +0200 |
| commit | 374a6c4544931a564221cccabb6abbda9e6bc558 (patch) | |
| tree | f16bf430101db87b84c6f21d909f862940ee68d8 /gitlab/v3/objects.py | |
| parent | 274b3bffc3365eca2fd3fa10c1e7e9b49990533e (diff) | |
| download | gitlab-374a6c4544931a564221cccabb6abbda9e6bc558.tar.gz | |
Fix merge_when_build_succeeds attribute name
Fixes #285
Diffstat (limited to 'gitlab/v3/objects.py')
| -rw-r--r-- | gitlab/v3/objects.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py index 68c2858..69a9721 100644 --- a/gitlab/v3/objects.py +++ b/gitlab/v3/objects.py @@ -1285,7 +1285,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. @@ -1293,8 +1293,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 @@ -1311,8 +1311,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, |