27a75ea175
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
113 lines
4.9 KiB
JSON
113 lines
4.9 KiB
JSON
{
|
|
"type": "object",
|
|
"properties" : {
|
|
"id": { "type": "integer" },
|
|
"iid": { "type": "integer" },
|
|
"author_id": { "type": "integer" },
|
|
"description": { "type": ["string", "null"] },
|
|
"lock_version": { "type": ["string", "null"] },
|
|
"milestone_id": { "type": ["string", "null"] },
|
|
"position": { "type": "integer" },
|
|
"state": { "type": "string" },
|
|
"title": { "type": "string" },
|
|
"updated_by_id": { "type": ["string", "null"] },
|
|
"created_at": { "type": "string" },
|
|
"updated_at": { "type": "string" },
|
|
"deleted_at": { "type": ["string", "null"] },
|
|
"time_estimate": { "type": "integer" },
|
|
"total_time_spent": { "type": "integer" },
|
|
"human_time_estimate": { "type": ["integer", "null"] },
|
|
"human_total_time_spent": { "type": ["integer", "null"] },
|
|
"milestone": { "type": ["object", "null"] },
|
|
"labels": { "type": ["array", "null"] },
|
|
"in_progress_merge_commit_sha": { "type": ["string", "null"] },
|
|
"merge_error": { "type": ["string", "null"] },
|
|
"merge_commit_sha": { "type": ["string", "null"] },
|
|
"merge_params": { "type": ["object", "null"] },
|
|
"merge_status": { "type": "string" },
|
|
"merge_user_id": { "type": ["integer", "null"] },
|
|
"merge_when_pipeline_succeeds": { "type": "boolean" },
|
|
"source_branch": { "type": "string" },
|
|
"source_project_id": { "type": "integer" },
|
|
"target_branch": { "type": "string" },
|
|
"target_project_id": { "type": "integer" },
|
|
"metrics": {
|
|
"oneOf": [
|
|
{ "type": "null" },
|
|
{ "$ref": "merge_request_metrics.json" }
|
|
]
|
|
},
|
|
"author": { "type": ["object", "null"] },
|
|
"merge_user": { "type": ["object", "null"] },
|
|
"diff_head_sha": { "type": ["string", "null"] },
|
|
"diff_head_commit_short_id": { "type": ["string", "null"] },
|
|
"merge_commit_message": { "type": ["string", "null"] },
|
|
"pipeline": { "type": ["object", "null"] },
|
|
"work_in_progress": { "type": "boolean" },
|
|
"source_branch_exists": { "type": "boolean" },
|
|
"mergeable_discussions_state": { "type": "boolean" },
|
|
"conflicts_can_be_resolved_in_ui": { "type": "boolean" },
|
|
"branch_missing": { "type": "boolean" },
|
|
"has_conflicts": { "type": "boolean" },
|
|
"can_be_merged": { "type": "boolean" },
|
|
"mergeable": { "type": "boolean" },
|
|
"project_archived": { "type": "boolean" },
|
|
"only_allow_merge_if_pipeline_succeeds": { "type": "boolean" },
|
|
"has_ci": { "type": "boolean" },
|
|
"ci_status": { "type": ["string", "null"] },
|
|
"issues_links": {
|
|
"type": "object",
|
|
"required": ["closing", "mentioned_but_not_closing", "assign_to_closing"],
|
|
"properties" : {
|
|
"closing": { "type": "string" },
|
|
"mentioned_but_not_closing": { "type": "string" },
|
|
"assign_to_closing": { "type": ["string", "null"] }
|
|
},
|
|
"additionalProperties": false
|
|
},
|
|
"source_branch_with_namespace_link": { "type": "string" },
|
|
"current_user": {
|
|
"type": "object",
|
|
"required": [
|
|
"can_remove_source_branch",
|
|
"can_revert_on_current_merge_request",
|
|
"can_cherry_pick_on_current_merge_request"
|
|
],
|
|
"properties": {
|
|
"can_remove_source_branch": { "type": "boolean" },
|
|
"can_revert_on_current_merge_request": { "type": ["boolean", "null"] },
|
|
"can_cherry_pick_on_current_merge_request": { "type": ["boolean", "null"] }
|
|
},
|
|
"additionalProperties": false
|
|
},
|
|
"target_branch_commits_path": { "type": "string" },
|
|
"target_branch_tree_path": { "type": "string" },
|
|
"source_branch_path": { "type": "string" },
|
|
"conflict_resolution_path": { "type": ["string", "null"] },
|
|
"cancel_merge_when_pipeline_succeeds_path": { "type": ["string", "null"] },
|
|
"create_issue_to_resolve_discussions_path": { "type": ["string", "null"] },
|
|
"merge_path": { "type": ["string", "null"] },
|
|
"cherry_pick_in_fork_path": { "type": ["string", "null"] },
|
|
"revert_in_fork_path": { "type": ["string", "null"] },
|
|
"email_patches_path": { "type": "string" },
|
|
"plain_diff_path": { "type": "string" },
|
|
"status_path": { "type": "string" },
|
|
"new_blob_path": { "type": ["string", "null"] },
|
|
"merge_check_path": { "type": "string" },
|
|
"ci_environments_status_path": { "type": "string" },
|
|
"merge_commit_message_with_description": { "type": "string" },
|
|
"diverged_commits_count": { "type": "integer" },
|
|
"commit_change_content_path": { "type": "string" },
|
|
"remove_wip_path": { "type": ["string", "null"] },
|
|
"commits_count": { "type": "integer" },
|
|
"remove_source_branch": { "type": ["boolean", "null"] },
|
|
"merge_ongoing": { "type": "boolean" },
|
|
"ff_only_enabled": { "type": ["boolean", false] },
|
|
"should_be_rebased": { "type": "boolean" },
|
|
"rebase_commit_sha": { "type": ["string", "null"] },
|
|
"rebase_in_progress": { "type": "boolean" },
|
|
"can_push_to_source_branch": { "type": "boolean" },
|
|
"rebase_path": { "type": ["string", "null"] }
|
|
},
|
|
"additionalProperties": false
|
|
}
|