diff options
| author | Matej Focko <mfocko@redhat.com> | 2021-07-16 12:02:00 +0200 |
|---|---|---|
| committer | John Villalovos <john@sodarock.com> | 2021-07-21 08:02:57 -0700 |
| commit | 1e24ab247cc783ae240e94f6cb379fef1e743a52 (patch) | |
| tree | 4afa494bb5565cffe1d9d9ddd66f7fac443c7d67 /gitlab | |
| parent | ef16a979031a77155907f4160e4f5e159d839737 (diff) | |
| download | gitlab-1e24ab247cc783ae240e94f6cb379fef1e743a52.tar.gz | |
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>
Diffstat (limited to 'gitlab')
| -rw-r--r-- | gitlab/v4/objects/merge_requests.py | 15 |
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(), |