Fix merge_when_build_succeeds attribute name

Gauvain Pocentek · Gauvain Pocentek · commit 374a6c454493 · 2017-07-09T09:19:02.000+02:00
Fixes #285
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py
@@ -1285,16 +1285,16 @@ def changes(self, **kwargs):
 
     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.
 
         Args:
             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 @@ def merge(self, merge_commit_message=None,
             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
@@ -900,25 +900,25 @@ def changes(self, **kwargs):
 
     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.
 
         Args:
             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 = {}
         if merge_commit_message:
             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)
