feat(api): add merge_ref for merge requests

mfocko · JohnVillalovos · commit 1e24ab247cc7 · 2021-07-21T08:02:57.000-07:00
Support merge_ref on merge requests that returns commit of attempted
merge of the MR.

Signed-off-by: Matej Focko &lt;mfocko@redhat.com&gt;
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
@@ -297,6 +297,21 @@ def rebase(self, **kwargs):
         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(),
