From 509396dbf6aca458a0072ca39e98805e21e24c87 Mon Sep 17 00:00:00 2001 From: alrayyes <511318+alrayyes@users.noreply.github.com> Date: Mon, 5 Oct 2026 09:30:12 +0000 Subject: [PATCH] fix: regenerate client from updated forge-dashboard spec --- openapi/SPEC_COMMIT | 2 +- openapi/openapi.yaml | 6 ++++-- .../pull_requests/enable_pull_request_auto_merge.py | 12 ++++++++---- .../api/pull_requests/merge_pull_request.py | 12 ++++++++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/openapi/SPEC_COMMIT b/openapi/SPEC_COMMIT index 7bfc6c3..129ecbb 100644 --- a/openapi/SPEC_COMMIT +++ b/openapi/SPEC_COMMIT @@ -1 +1 @@ -9cb2eaed5ef2fa38a924c4ba72c11d96f0f7cff5 +3d97b910e45612e597ee18616e32be95decadf35 diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index 37b3ceb..c0731d2 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -893,7 +893,8 @@ paths: description: | Merges the named pull request using its repo's own configured default merge method — GitHub is asked to pick its own repo - default; Forgejo's API has no such default built in, so this + default, except that a base branch requiring linear history gets + squash or rebase, never a merge commit; Forgejo's API has no such default built in, so this looks up the repo's configured default merge style first and passes that explicitly. Neither takes a method override here; picking one is out of scope for this endpoint. @@ -978,7 +979,8 @@ paths: mutation asks for an explicit merge method rather than picking the repo's own default itself, so this looks the repo's allowed methods up first and picks one with the same merge > squash > - rebase precedence Merge already uses; no override is exposed + rebase precedence Merge already uses, skipping merge when the + default branch requires linear history; no override is exposed here either. The pull request stays open and unmerged until the forge's own required checks pass on their own. diff --git a/src/forge_dashboard/_generated/api/pull_requests/enable_pull_request_auto_merge.py b/src/forge_dashboard/_generated/api/pull_requests/enable_pull_request_auto_merge.py index 73ba390..7e0320a 100644 --- a/src/forge_dashboard/_generated/api/pull_requests/enable_pull_request_auto_merge.py +++ b/src/forge_dashboard/_generated/api/pull_requests/enable_pull_request_auto_merge.py @@ -117,7 +117,8 @@ def sync_detailed( mutation asks for an explicit merge method rather than picking the repo's own default itself, so this looks the repo's allowed methods up first and picks one with the same merge > squash > - rebase precedence Merge already uses; no override is exposed + rebase precedence Merge already uses, skipping merge when the + default branch requires linear history; no override is exposed here either. The pull request stays open and unmerged until the forge's own required checks pass on their own. @@ -168,7 +169,8 @@ def sync( mutation asks for an explicit merge method rather than picking the repo's own default itself, so this looks the repo's allowed methods up first and picks one with the same merge > squash > - rebase precedence Merge already uses; no override is exposed + rebase precedence Merge already uses, skipping merge when the + default branch requires linear history; no override is exposed here either. The pull request stays open and unmerged until the forge's own required checks pass on their own. @@ -214,7 +216,8 @@ async def asyncio_detailed( mutation asks for an explicit merge method rather than picking the repo's own default itself, so this looks the repo's allowed methods up first and picks one with the same merge > squash > - rebase precedence Merge already uses; no override is exposed + rebase precedence Merge already uses, skipping merge when the + default branch requires linear history; no override is exposed here either. The pull request stays open and unmerged until the forge's own required checks pass on their own. @@ -265,7 +268,8 @@ async def asyncio( mutation asks for an explicit merge method rather than picking the repo's own default itself, so this looks the repo's allowed methods up first and picks one with the same merge > squash > - rebase precedence Merge already uses; no override is exposed + rebase precedence Merge already uses, skipping merge when the + default branch requires linear history; no override is exposed here either. The pull request stays open and unmerged until the forge's own required checks pass on their own. diff --git a/src/forge_dashboard/_generated/api/pull_requests/merge_pull_request.py b/src/forge_dashboard/_generated/api/pull_requests/merge_pull_request.py index a40acc0..f020d32 100644 --- a/src/forge_dashboard/_generated/api/pull_requests/merge_pull_request.py +++ b/src/forge_dashboard/_generated/api/pull_requests/merge_pull_request.py @@ -120,7 +120,8 @@ def sync_detailed( Merges the named pull request using its repo's own configured default merge method — GitHub is asked to pick its own repo - default; Forgejo's API has no such default built in, so this + default, except that a base branch requiring linear history gets + squash or rebase, never a merge commit; Forgejo's API has no such default built in, so this looks up the repo's configured default merge style first and passes that explicitly. Neither takes a method override here; picking one is out of scope for this endpoint. @@ -166,7 +167,8 @@ def sync( Merges the named pull request using its repo's own configured default merge method — GitHub is asked to pick its own repo - default; Forgejo's API has no such default built in, so this + default, except that a base branch requiring linear history gets + squash or rebase, never a merge commit; Forgejo's API has no such default built in, so this looks up the repo's configured default merge style first and passes that explicitly. Neither takes a method override here; picking one is out of scope for this endpoint. @@ -207,7 +209,8 @@ async def asyncio_detailed( Merges the named pull request using its repo's own configured default merge method — GitHub is asked to pick its own repo - default; Forgejo's API has no such default built in, so this + default, except that a base branch requiring linear history gets + squash or rebase, never a merge commit; Forgejo's API has no such default built in, so this looks up the repo's configured default merge style first and passes that explicitly. Neither takes a method override here; picking one is out of scope for this endpoint. @@ -253,7 +256,8 @@ async def asyncio( Merges the named pull request using its repo's own configured default merge method — GitHub is asked to pick its own repo - default; Forgejo's API has no such default built in, so this + default, except that a base branch requiring linear history gets + squash or rebase, never a merge commit; Forgejo's API has no such default built in, so this looks up the repo's configured default merge style first and passes that explicitly. Neither takes a method override here; picking one is out of scope for this endpoint.