Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/added-16677-merge-train-settings.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Expose conflict-aware merge train, rebase-attempt and stall-warning controls under Settings → Auto-merge → Merge train, including disabling stall warnings with zero seconds ([#16677](https://github.com/hivecommons/hive/issues/16677)).
201 changes: 200 additions & 1 deletion dashboard/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3730,6 +3730,64 @@
}
}
}
},
"patch": {
"tags": [
"Governor"
],
"summary": "Partially update merge-train stall warnings",
"description": "Updates governor.merge_train_stall_warn_s without changing other governor settings. Requires owner role. Returns the effective interval; failed persistence rolls back the update.",
"requestBody": {
"required": true,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"merge_train_stall_warn_s": {
"type": "integer",
"minimum": 0,
"maximum": 9223372036,
"description": "Stall-warning interval in seconds; 0 disables warnings. Omission leaves the setting unchanged."
}
}
}
}
}
},
"responses": {
"200": {
"description": "Effective stall-warning interval",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"merge_train_stall_warn_s": {
"type": "integer",
"minimum": 0
}
},
"required": [
"merge_train_stall_warn_s"
]
}
}
}
},
"400": {
"description": "Invalid body or stall-warning interval outside the supported duration range"
},
"403": {
"description": "Owner role required"
},
"500": {
"description": "Failed to persist governor settings; update rolled back"
},
"503": {
"description": "Config unavailable"
}
}
}
},
"/api/config/sidebar": {
Expand Down Expand Up @@ -24142,6 +24200,19 @@
"items": {
"type": "string"
}
},
"merge_train": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"max_rebase_attempts": {
"type": "integer",
"minimum": 0,
"description": "Maximum rebase attempts per front; 0 uses the default of 2."
}
}
}
}
}
Expand Down Expand Up @@ -24178,6 +24249,19 @@
"type": "string"
},
"nullable": true
},
"merge_train": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"max_rebase_attempts": {
"type": "integer",
"minimum": 0,
"description": "Maximum rebase attempts per front; 0 uses the default of 2."
}
}
}
}
}
Expand Down Expand Up @@ -24206,14 +24290,129 @@
"items": {
"type": "string"
}
},
"merge_train": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"max_rebase_attempts": {
"type": "integer",
"minimum": 0,
"description": "Maximum rebase attempts per front; 0 uses the default of 2."
}
}
}
}
}
}
}
},
"400": {
"description": "max_merges must be >= 0"
"description": "Invalid auto-merge settings, including negative max_merges or merge_train.max_rebase_attempts"
}
}
},
"patch": {
"tags": [
"System"
],
"summary": "Partially update top-level auto-merge config",
"description": "Uses the same writer as PUT. Supports nested merge_train settings; omitted fields remain unchanged. Requires owner role. Returns effective auto-merge settings with bot_authors metadata; failed persistence rolls back the update.",
"requestBody": {
"required": true,
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"self_authored": {
"type": "boolean",
"nullable": true
},
"max_merges": {
"type": "integer",
"nullable": true,
"minimum": 0
},
"required_checks": {
"type": "array",
"items": {
"type": "string"
},
"nullable": true
},
"merge_train": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"max_rebase_attempts": {
"type": "integer",
"minimum": 0,
"description": "Maximum rebase attempts per front; 0 uses the default of 2."
}
}
}
}
}
}
}
},
"responses": {
"200": {
"description": "Updated config",
"content": {
"application/json": {
"schema": {
"type": "object",
"properties": {
"self_authored": {
"type": "boolean"
},
"self_authored_set": {
"type": "boolean"
},
"max_merges": {
"type": "integer"
},
"required_checks": {
"type": "array",
"items": {
"type": "string"
}
},
"merge_train": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"max_rebase_attempts": {
"type": "integer",
"minimum": 0,
"description": "Maximum rebase attempts per front; 0 uses the default of 2."
}
}
}
}
}
}
}
},
"400": {
"description": "Invalid auto-merge settings, including negative max_merges or merge_train.max_rebase_attempts"
},
"403": {
"description": "Owner role required"
},
"500": {
"description": "Failed to persist auto-merge settings; update rolled back"
},
"503": {
"description": "Config unavailable"
}
}
}
Expand Down
Loading
Loading