Commit67d9a89

Gauvain Pocentek

committed

Fix merge_when_build_succeeds attribute name

1 parentcb8c1a1 commit67d9a89Copy full SHA for 67d9a89

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1286,16 +1286,16 @@ def changes(self, **kwargs):`
`1286`	`1286`
`1287`	`1287`	`defmerge(self,merge_commit_message=None,`
`1288`	`1288`	`should_remove_source_branch=False,`
`1289`		`-merged_when_build_succeeds=False,`
	`1289`	`+merge_when_build_succeeds=False,`
`1290`	`1290`	`**kwargs):`
`1291`	`1291`	`"""Accept the merge request.`
`1292`	`1292`
`1293`	`1293`	`Args:`
`1294`	`1294`	`merge_commit_message (bool): Commit message`
`1295`	`1295`	`should_remove_source_branch (bool): If True, removes the source`
`1296`	`1296`	`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`
`1299`	`1299`
`1300`	`1300`	`Returns:`
`1301`	`1301`	`ProjectMergeRequest: The updated MR`
`@@ -1312,8 +1312,8 @@ def merge(self, merge_commit_message=None,`
`1312`	`1312`	`data['merge_commit_message']=merge_commit_message`
`1313`	`1313`	`ifshould_remove_source_branch:`
`1314`	`1314`	`data['should_remove_source_branch']=True`
`1315`		`-ifmerged_when_build_succeeds:`
`1316`		`-data['merged_when_build_succeeds']=True`
	`1315`	`+ifmerge_when_build_succeeds:`
	`1316`	`+data['merge_when_build_succeeds']=True`
`1317`	`1317`
`1318`	`1318`	`r=self.gitlab._raw_put(url,data=data,**kwargs)`
`1319`	`1319`	`errors= {401:GitlabMRForbiddenError,`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1244,16 +1244,16 @@ def changes(self, **kwargs):`
`1244`	`1244`
`1245`	`1245`	`defmerge(self,merge_commit_message=None,`
`1246`	`1246`	`should_remove_source_branch=False,`
`1247`		`-merged_when_build_succeeds=False,`
	`1247`	`+merge_when_pipeline_succeeds=False,`
`1248`	`1248`	`**kwargs):`
`1249`	`1249`	`"""Accept the merge request.`
`1250`	`1250`
`1251`	`1251`	`Args:`
`1252`	`1252`	`merge_commit_message (bool): Commit message`
`1253`	`1253`	`should_remove_source_branch (bool): If True, removes the source`
`1254`	`1254`	`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`
`1257`	`1257`
`1258`	`1258`	`Returns:`
`1259`	`1259`	`ProjectMergeRequest: The updated MR`
`@@ -1270,8 +1270,8 @@ def merge(self, merge_commit_message=None,`
`1270`	`1270`	`data['merge_commit_message']=merge_commit_message`
`1271`	`1271`	`ifshould_remove_source_branch:`
`1272`	`1272`	`data['should_remove_source_branch']=True`
`1273`		`-ifmerged_when_build_succeeds:`
`1274`		`-data['merged_when_build_succeeds']=True`
	`1273`	`+ifmerge_when_pipeline_succeeds:`
	`1274`	`+data['merge_when_pipeline_succeeds']=True`
`1275`	`1275`
`1276`	`1276`	`r=self.gitlab._raw_put(url,data=data,**kwargs)`
`1277`	`1277`	`errors= {401:GitlabMRForbiddenError,`

Comments

(0)