Skip to content

Commit 67d9a89

Browse files
author
Gauvain Pocentek
committed
Fix merge_when_build_succeeds attribute name
Fixes #285
1 parent cb8c1a1 commit 67d9a89

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎gitlab/v3/objects.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,16 +1286,16 @@ def changes(self, **kwargs):
12861286

12871287
def merge(self, merge_commit_message=None,
12881288
should_remove_source_branch=False,
1289-
merged_when_build_succeeds=False,
1289+
merge_when_build_succeeds=False,
12901290
**kwargs):
12911291
"""Accept the merge request.
12921292
12931293
Args:
12941294
merge_commit_message (bool): Commit message
12951295
should_remove_source_branch (bool): If True, removes the source
12961296
branch
1297-
merged_when_build_succeeds (bool): Wait for the build to succeed,
1298-
then merge
1297+
merge_when_build_succeeds (bool): Wait for the build to succeed,
1298+
then merge
12991299
13001300
Returns:
13011301
ProjectMergeRequest: The updated MR
@@ -1312,8 +1312,8 @@ def merge(self, merge_commit_message=None,
13121312
data['merge_commit_message'] = merge_commit_message
13131313
if should_remove_source_branch:
13141314
data['should_remove_source_branch'] = True
1315-
if merged_when_build_succeeds:
1316-
data['merged_when_build_succeeds'] = True
1315+
if merge_when_build_succeeds:
1316+
data['merge_when_build_succeeds'] = True
13171317

13181318
r = self.gitlab._raw_put(url, data=data, **kwargs)
13191319
errors = {401: GitlabMRForbiddenError,

‎gitlab/v4/objects.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,16 +1244,16 @@ def changes(self, **kwargs):
12441244

12451245
def merge(self, merge_commit_message=None,
12461246
should_remove_source_branch=False,
1247-
merged_when_build_succeeds=False,
1247+
merge_when_pipeline_succeeds=False,
12481248
**kwargs):
12491249
"""Accept the merge request.
12501250
12511251
Args:
12521252
merge_commit_message (bool): Commit message
12531253
should_remove_source_branch (bool): If True, removes the source
12541254
branch
1255-
merged_when_build_succeeds (bool): Wait for the build to succeed,
1256-
then merge
1255+
merge_when_pipeline_succeeds (bool): Wait for the build to succeed,
1256+
then merge
12571257
12581258
Returns:
12591259
ProjectMergeRequest: The updated MR
@@ -1270,8 +1270,8 @@ def merge(self, merge_commit_message=None,
12701270
data['merge_commit_message'] = merge_commit_message
12711271
if should_remove_source_branch:
12721272
data['should_remove_source_branch'] = True
1273-
if merged_when_build_succeeds:
1274-
data['merged_when_build_succeeds'] = True
1273+
if merge_when_pipeline_succeeds:
1274+
data['merge_when_pipeline_succeeds'] = True
12751275

12761276
r = self.gitlab._raw_put(url, data=data, **kwargs)
12771277
errors = {401: GitlabMRForbiddenError,

0 commit comments

Comments
 (0)