Skip to content

Export repo's manual merge settings #34502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 19, 2025
Merged

Export repo's manual merge settings #34502

merged 1 commit into from
May 19, 2025

Conversation

AdamMajer
Copy link
Contributor

Fixes: #34501

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 19, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 19, 2025
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label May 19, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 19, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 19, 2025
@lunny lunny added this to the 1.25.0 milestone May 19, 2025
@techknowlogick techknowlogick merged commit 9cfcc07 into go-gitea:main May 19, 2025
26 checks passed
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 21, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
2549ad6 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix ephemeral runner deletion (go-gitea#34447)
  ui: add a default tab on repo header when migrating (go-gitea#34503)
  Use run-name and evaluate workflow variables (go-gitea#34301)
  feat(api): add date range filtering to commit retrieval endpoints (go-gitea#34497)
  Export repo's manual merge settings (go-gitea#34502)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 18, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

API: repoGet doesn't export manual merge options
4 participants
@AdamMajer @lunny @techknowlogick @GiteaBot