Commite7d4d91

authored

Merge pull request#1776 from python-gitlab/jlvillal/rebase_in_progress

Add some docs for getting the status of a merge_request rebase

2 parents83dcabf +bfa3dbe commite7d4d91Copy full SHA for e7d4d91

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ API examples`
`30`	`30`	`gl_objects/labels`
`31`	`31`	`gl_objects/notifications`
`32`	`32`	`gl_objects/merge_trains`
`33`		`-gl_objects/mrs`
`34`		`-gl_objects/mr_approvals`
	`33`	`+gl_objects/merge_requests`
	`34`	`+gl_objects/merge_request_approvals.rst`
`35`	`35`	`gl_objects/milestones`
`36`	`36`	`gl_objects/namespaces`
`37`	`37`	`gl_objects/notes`

File renamed without changes.

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,14 @@ Attempt to rebase an MR::`
`186`	`186`
`187`	`187`	`mr.rebase()`
`188`	`188`
	`189`	`+Get status of a rebase for an MR::`
	`190`	`+`
	`191`	`+ mr = project.mergerequests.get(mr_id, include_rebase_in_progress=True)`
	`192`	`+ print(mr.rebase_in_progress, mr.merge_error)`
	`193`	`+`
	`194`	`+For more info see:`
	`195`	`+https://docs.gitlab.com/ee/api/merge_requests.html#rebase-a-merge-request`
	`196`	`+`
`189`	`197`	`Attempt to merge changes between source and target branch::`
`190`	`198`
`191`	`199`	`response = mr.merge_ref()`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,11 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):`
`396`	`396`	`_path="/projects/{project_id}/merge_requests"`
`397`	`397`	`_obj_cls=ProjectMergeRequest`
`398`	`398`	`_from_parent_attrs= {"project_id":"id"}`
	`399`	`+_optional_get_attrs= (`
	`400`	`+"render_html",`
	`401`	`+"include_diverged_commits_count",`
	`402`	`+"include_rebase_in_progress",`
	`403`	`+ )`
`399`	`404`	`_create_attrs=RequiredOptional(`
`400`	`405`	`required=("source_branch","target_branch","title"),`
`401`	`406`	`optional=(`

Comments

(0)