github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-09 04:25:18 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[v1.17.0] Automerge / Admin merge sometimes doesn't work #9333

New Issue
Closed
opened 2025-11-02 08:35:46 -06:00 by GiteaMirror · 5 comments
GiteaMirror commented 2025-11-02 08:35:46 -06:00
Owner
Copy Link

Originally created by @viceice on GitHub (Aug 3, 2022).

Description

I've two issues1 which are closely related with latest gitea v1.17.0

  1. I can't see the automerge feature, but normally i can force merge as admin.

  2. Today i couldn't merge PR's because they where blocked because they are outdated

Gitea Version

1.17.0

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

image

Git Version

offical docker image

Operating System

offical docker image

How are you running Gitea?

2 node HA from official gitea chart with redis / nfs

Database

PostgreSQL

Originally created by @viceice on GitHub (Aug 3, 2022). ### Description I've two issues[^1] which are closely related with latest gitea v1.17.0 1. I can't see the automerge feature, but normally i can force merge as admin. 2. Today i couldn't merge PR's because they where blocked because they are outdated [^1]: https://discourse.gitea.io/t/gitea-automerge-when-succeed-v1-17/5620 ### Gitea Version 1.17.0 ### Can you reproduce the bug on the Gitea demo site? No ### Log Gist _No response_ ### Screenshots ![](https://user-images.githubusercontent.com/1798109/182147212-2be87e30-7797-4fec-94c2-a774ed0c4595.png) ![image](https://user-images.githubusercontent.com/1798109/182529667-48fd29b9-d6f4-4575-9179-dac741c4b788.png) ### Git Version offical docker image ### Operating System offical docker image ### How are you running Gitea? 2 node HA from official gitea chart with redis / nfs ### Database PostgreSQL
GiteaMirror added the type/bug label 2025-11-02 08:35:46 -06:00
GiteaMirror commented 2025-11-02 08:35:46 -06:00
Author
Owner
Copy Link

@viceice commented on GitHub (Aug 3, 2022):

After updating the protection rule i could merge ad admin again.

@viceice commented on GitHub (Aug 3, 2022): After updating the protection rule i could merge ad admin again.
GiteaMirror commented 2025-11-02 08:35:47 -06:00
Author
Owner
Copy Link

@viceice commented on GitHub (Aug 3, 2022):

I also saw PR's stuck in merge conflict check
image

@viceice commented on GitHub (Aug 3, 2022): I also saw PR's stuck in merge conflict check ![image](https://user-images.githubusercontent.com/1798109/182536027-602a3949-8494-4b54-93fe-effd298b62a4.png)
GiteaMirror commented 2025-11-02 08:35:47 -06:00
Author
Owner
Copy Link

@viceice commented on GitHub (Aug 3, 2022):

sometimes i also see broken fork information after using the merge update button

image

this fixes itself after a few seconds and a page reload

@viceice commented on GitHub (Aug 3, 2022): sometimes i also see broken fork information after using the merge update button ![image](https://user-images.githubusercontent.com/1798109/182536428-dabb7bfa-3d04-4be7-b464-bf1523188286.png) this fixes itself after a few seconds and a page reload
GiteaMirror commented 2025-11-02 08:35:47 -06:00
Author
Owner
Copy Link

@viceice commented on GitHub (Aug 3, 2022):

Ok, i need to enable at least two merge methods to get the dropdown for automerge

@viceice commented on GitHub (Aug 3, 2022): Ok, i need to enable at least two merge methods to get the dropdown for automerge
GiteaMirror commented 2025-11-02 08:35:47 -06:00
Author
Owner
Copy Link

@lunny commented on GitHub (May 2, 2024):

I think this is the same as #24445 and should be fixed by #30780

@lunny commented on GitHub (May 2, 2024): I think this is the same as #24445 and should be fixed by #30780
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#9333
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?