summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitlab/v4/objects/merge_requests.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
index 1ea1c69..2559207 100644
--- a/gitlab/v4/objects/merge_requests.py
+++ b/gitlab/v4/objects/merge_requests.py
@@ -297,6 +297,21 @@ class ProjectMergeRequest(
data = {}
return self.manager.gitlab.http_put(path, post_data=data, **kwargs)
+ @cli.register_custom_action("ProjectMergeRequest")
+ @exc.on_http_error(exc.GitlabGetError)
+ def merge_ref(self, **kwargs):
+ """Attempt to merge changes between source and target branches into
+ `refs/merge-requests/:iid/merge`.
+
+ Args:
+ **kwargs: Extra options to send to the server (e.g. sudo)
+
+ Raises:
+ GitlabGetError: If cannot be merged
+ """
+ path = "%s/%s/merge_ref" % (self.manager.path, self.get_id())
+ return self.manager.gitlab.http_get(path, **kwargs)
+
@cli.register_custom_action(
"ProjectMergeRequest",
tuple(),