From 374a6c4544931a564221cccabb6abbda9e6bc558 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Sun, 9 Jul 2017 09:16:27 +0200 Subject: Fix merge_when_build_succeeds attribute name Fixes #285 --- gitlab/v4/objects.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gitlab/v4/objects.py') 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) -- cgit v1.2.1