Repository navigation
Commit 1e24ab2
feat(api): add merge_ref for merge requests
Support merge_ref on merge requests that returns commit of attempted
merge of the MR.
Signed-off-by: Matej Focko <mfocko@redhat.com>1 parent ef16a97 commit 1e24ab2
1 file changed
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -297,6 +297,21 @@ def rebase(self, **kwargs): | |||
| 297 | 297 | data = {} | |
| 298 | 298 | return self.manager.gitlab.http_put(path, post_data=data, **kwargs) | |
| 299 | 299 | ||
| 300 | + @cli.register_custom_action("ProjectMergeRequest") | ||
| 301 | + @exc.on_http_error(exc.GitlabGetError) | ||
| 302 | + def merge_ref(self, **kwargs): | ||
| 303 | + """Attempt to merge changes between source and target branches into | ||
| 304 | + `refs/merge-requests/:iid/merge`. | ||
| 305 | + | ||
| 306 | + Args: | ||
| 307 | + **kwargs: Extra options to send to the server (e.g. sudo) | ||
| 308 | + | ||
| 309 | + Raises: | ||
| 310 | + GitlabGetError: If cannot be merged | ||
| 311 | + """ | ||
| 312 | + path = "%s/%s/merge_ref" % (self.manager.path, self.get_id()) | ||
| 313 | + return self.manager.gitlab.http_get(path, **kwargs) | ||
| 314 | + | ||
| 300 | 315 | @cli.register_custom_action( | |
| 301 | 316 | "ProjectMergeRequest", | |
| 302 | 317 | tuple(), | |
0 commit comments