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
2 changes: 1 addition & 1 deletion openapi/SPEC_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9cb2eaed5ef2fa38a924c4ba72c11d96f0f7cff5
3d97b910e45612e597ee18616e32be95decadf35
6 changes: 4 additions & 2 deletions openapi/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Loading