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 | |
| parent | 274b3bffc3365eca2fd3fa10c1e7e9b49990533e (diff) | |
| download | gitlab-374a6c4544931a564221cccabb6abbda9e6bc558.tar.gz | |
Fix merge_when_build_succeeds attribute name
Fixes #285
| -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 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, diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 9c52897..d4b0395 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -900,7 +900,7 @@ class ProjectMergeRequest(SubscribableMixin, TodoMixin, TimeTrackingMixin, 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. @@ -908,8 +908,8 @@ class ProjectMergeRequest(SubscribableMixin, TodoMixin, TimeTrackingMixin, 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 """ path = '%s/%s/merge' % (self.manager.path, self.get_id()) data = {} @@ -917,8 +917,8 @@ class ProjectMergeRequest(SubscribableMixin, TodoMixin, TimeTrackingMixin, 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 server_data = self.manager.gitlab.http_put(path, post_data=data, **kwargs) |