|
2306 | 2306 | "default": null, |
2307 | 2307 | "description": "The name of the queue where the pull request should be added. If no name is set, queue_conditions will be applied instead.", |
2308 | 2308 | "title": "Name" |
2309 | | - }, |
2310 | | - "merge_method": { |
2311 | | - "anyOf": [ |
2312 | | - { |
2313 | | - "enum": [ |
2314 | | - "merge", |
2315 | | - "rebase", |
2316 | | - "squash", |
2317 | | - "fast-forward" |
2318 | | - ], |
2319 | | - "type": "string" |
2320 | | - }, |
2321 | | - { |
2322 | | - "type": "null" |
2323 | | - } |
2324 | | - ], |
2325 | | - "configuration_deprecated_attribute": { |
2326 | | - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `merge_method` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules", |
2327 | | - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `merge_method` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules" |
2328 | | - }, |
2329 | | - "default": null, |
2330 | | - "deprecated": true, |
2331 | | - "description": "Merge method to use. If no value is set, Mergify uses the first authorized method available in the repository configuration. `fast-forward` is not supported on queues with `max_parallel_checks > 1, `batch_size > 1`, or with `allow_inplace_checks` set to `false`.", |
2332 | | - "title": "Merge Method" |
2333 | | - }, |
2334 | | - "merge_bot_account": { |
2335 | | - "anyOf": [ |
2336 | | - { |
2337 | | - "description": "A string template using the Jinja2 syntax.", |
2338 | | - "format": "template", |
2339 | | - "title": "Template", |
2340 | | - "type": "string" |
2341 | | - }, |
2342 | | - { |
2343 | | - "type": "null" |
2344 | | - } |
2345 | | - ], |
2346 | | - "default": null, |
2347 | | - "deprecated": true, |
2348 | | - "description": "Mergify can impersonate a GitHub user to merge pull requests. If no `merge_bot_account` is set, Mergify merges the pull request itself. The user account **must** have already been logged in Mergify dashboard once and have **write** or **maintain** permission.", |
2349 | | - "title": "Merge Bot Account" |
2350 | | - }, |
2351 | | - "update_bot_account": { |
2352 | | - "anyOf": [ |
2353 | | - { |
2354 | | - "description": "A string template using the Jinja2 syntax.", |
2355 | | - "format": "template", |
2356 | | - "title": "Template", |
2357 | | - "type": "string" |
2358 | | - }, |
2359 | | - { |
2360 | | - "type": "null" |
2361 | | - } |
2362 | | - ], |
2363 | | - "configuration_deprecated_attribute": { |
2364 | | - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `update_bot_account` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules", |
2365 | | - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `update_bot_account` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules" |
2366 | | - }, |
2367 | | - "default": null, |
2368 | | - "deprecated": true, |
2369 | | - "description": "For certain actions, such as rebasing branches, Mergify has to impersonate a GitHub user. You can specify the account to use with this option. If no `update_bot_account` is set, Mergify picks randomly one of the organization users instead. The user account **must** have already been logged in Mergify dashboard once. This option overrides the value defined in the queue rules section of the configuration.", |
2370 | | - "title": "Update Bot Account" |
2371 | | - }, |
2372 | | - "update_method": { |
2373 | | - "anyOf": [ |
2374 | | - { |
2375 | | - "enum": [ |
2376 | | - "merge", |
2377 | | - "rebase" |
2378 | | - ], |
2379 | | - "type": "string" |
2380 | | - }, |
2381 | | - { |
2382 | | - "type": "null" |
2383 | | - } |
2384 | | - ], |
2385 | | - "configuration_deprecated_attribute": { |
2386 | | - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `update_method` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules", |
2387 | | - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `update_method` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules" |
2388 | | - }, |
2389 | | - "default": null, |
2390 | | - "deprecated": true, |
2391 | | - "description": "Method to use to update the pull request with its base\nbranch when the check is done in place. Possible values:\n\n- `merge` to merge the base branch into the pull request.\n- `rebase` to rebase the pull request against its base branch.\n\nThis option overrides the value defined in the queue rules section of the configuration.\nThe default is rebase when the `merge_method` is `fast-forward`.", |
2392 | | - "title": "Update Method" |
2393 | | - }, |
2394 | | - "commit_message_template": { |
2395 | | - "anyOf": [ |
2396 | | - { |
2397 | | - "description": "A string template using the Jinja2 syntax.", |
2398 | | - "format": "template", |
2399 | | - "title": "Template", |
2400 | | - "type": "string" |
2401 | | - }, |
2402 | | - { |
2403 | | - "type": "null" |
2404 | | - } |
2405 | | - ], |
2406 | | - "configuration_deprecated_attribute": { |
2407 | | - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `commit_message_template` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed in a future version.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules", |
2408 | | - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `commit_message_template` attribute of the queue action in one or more `pull_request_rules`. It must now be used under the `queue_rules` configuration.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules" |
2409 | | - }, |
2410 | | - "default": null, |
2411 | | - "deprecated": true, |
2412 | | - "description": "Template to use as the commit message when using the merge or squash merge method.", |
2413 | | - "title": "Commit Message Template" |
2414 | | - }, |
2415 | | - "allow_merging_configuration_change": { |
2416 | | - "configuration_deprecated_attribute": { |
2417 | | - "deprecated_summary_ghes_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_merging_configuration_change` attribute of the queue action in one or more `pull_request_rules`. It must be removed from the configuration.**\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules", |
2418 | | - "deprecated_summary_saas_mode": "\n:bangbang: **Action Required** :bangbang:\n> **The configuration uses the deprecated `allow_merging_configuration_change` attribute of the queue action in one or more `pull_request_rules`. It must be removed from the configuration.**\n> This option will be removed on January 31st, 2025.\n> For more information: https://docs.mergify.com/configuration/file-format/#queue-rules" |
2419 | | - }, |
2420 | | - "default": true, |
2421 | | - "deprecated": true, |
2422 | | - "description": "Allow merging the Mergify configuration file. *This option does not do anything and is only present for backward compatibility.*", |
2423 | | - "title": "Allow Merging Configuration Change", |
2424 | | - "type": "boolean" |
2425 | 2309 | } |
2426 | 2310 | }, |
2427 | 2311 | "title": "QueueActionModel", |
|
2600 | 2484 | "anyOf": [ |
2601 | 2485 | { |
2602 | 2486 | "enum": [ |
2603 | | - "merge", |
2604 | | - "rebase" |
| 2487 | + "rebase", |
| 2488 | + "merge" |
2605 | 2489 | ], |
2606 | 2490 | "type": "string" |
2607 | 2491 | }, |
|
2824 | 2708 | "anyOf": [ |
2825 | 2709 | { |
2826 | 2710 | "enum": [ |
2827 | | - "merge", |
2828 | | - "rebase" |
| 2711 | + "rebase", |
| 2712 | + "merge" |
2829 | 2713 | ], |
2830 | 2714 | "type": "string" |
2831 | 2715 | }, |
|
0 commit comments