Skip to content
Snippets Groups Projects
Commit 007c2d3e authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Use the good old curl

parent 5bd744cd
No related branches found
No related tags found
No related merge requests found
...@@ -114,28 +114,31 @@ class Gitlab(object): ...@@ -114,28 +114,31 @@ class Gitlab(object):
return json.loads(pipeline.decode()) return json.loads(pipeline.decode())
def accept_merge_request(self, project_id, mergerequest_id, def accept_merge_request(self, project_id, mergerequest_id,
merge_commit_message=None, merge_commit_message='',
should_remove_source_branch=None, should_remove_source_branch='',
merge_when_pipeline_succeeds=None, sha=None): merge_when_pipeline_succeeds='', sha=''):
""" """
Update an existing merge request. Update an existing merge request.
""" """
data = { url = "projects/{}/merge_request/{}/merge?"
'merge_commit_message': merge_commit_message, url += "&".join([
'should_remove_source_branch': should_remove_source_branch, 'merge_commit_message={}',
'merge_when_pipeline_succeeds': merge_when_pipeline_succeeds, 'should_remove_source_branch={}',
'sha': sha, 'merge_when_pipeline_succeeds={}',
} 'sha={}',
])
request = requests.put( url = url.format(project_id, mergerequest_id, merge_commit_message,
'{0}/{1}/merge_request/{2}/merge'.format( should_remove_source_branch,
self.projects_url, project_id, mergerequest_id), merge_when_pipeline_succeeds,
data=data, headers={'PRIVATE-TOKEN': self.token}) sha)
cmd = ["curl", "--request", "PUT", "--header",
if request.status_code == 200: "PRIVATE-TOKEN: {}".format(self.token),
return request.json() self.base_url + url]
else: pipeline = subprocess.check_output(cmd)
try:
return json.loads(pipeline.decode())
except Exception:
return False return False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment