Skip to content
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

Marking pr as manually merged doens't do anything #21912

Closed
tautf opened this issue Nov 23, 2022 · 3 comments · Fixed by #23015
Closed

Marking pr as manually merged doens't do anything #21912

tautf opened this issue Nov 23, 2022 · 3 comments · Fixed by #23015
Labels
type/bug
Milestone
1.18.5

Comments

@tautf
Copy link

tautf commented Nov 23, 2022 •
edited
Loading

Description

I merged a pull request the normal way with clicking "Merge". During the "merge process" i left the page which caused this behaviour.

  • Branches are merged together

  • PR still open and unmergeable because branch is already included in target
    Bildschirmfoto 2022-11-23 um 11 52 43 AM

  • Clicking "Manual Merge" does nothing

  • Im not able to close this PR (with this button, of course with the "Close" functionality")

Maybe dont have "Manual Merge" as a button if nothing happens.

Gitea Version

1.17.2

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

none, integrated

Operating System

Windows Server 2019

How are you running Gitea?

Windows amd64 executable

Database

PostgreSQL
@tautf tautf added the type/bug label Nov 23, 2022
@a-n-dokuchaev
Copy link

Help us, please. Last 2 of 50 PRs with this issue.

@lunny lunny added this to the 1.18.1 milestone Jan 10, 2023
@lunny lunny modified the milestones: 1.18.1, 1.18.2, 1.18.3 Jan 18, 2023
@ghost
Copy link

ghost commented Jan 22, 2023

I can reproduce this issue on Gitea 1.19.0+dev-341-geb793c336 logs don't seem to be very interesting, but I can post them if you want to. I was also using the Tor Browser, in case that makes any difference.

@jolheiser jolheiser modified the milestones: 1.18.3, 1.18.4 Jan 23, 2023
@lunny lunny modified the milestones: 1.18.4, 1.18.5 Feb 19, 2023
@wxiaoguang wxiaoguang mentioned this issue Feb 20, 2023
Merged
@wxiaoguang
Copy link
Contributor

Sorry I missed this issue.

There are 2 problems here:

  1. When the browser leaves the page, the connection is disconnected and Gitea may not finish its work (especially the necessary database updating), so the PR is left open. This problem should be fixed by other approaches.
  2. The Manually Merged form is broken, it will be fixed by Fix the Manually Merged form #23015

lunny added a commit that referenced this issue Feb 21, 2023
@wxiaoguang @wolfogre @lunny
Fix the Manually Merged form (#23015)
e7b560f 
Regression bug of #19650

Close #20983
Close #21912

### The "Manually Merged" form

![image](https://user-images.githubusercontent.com/2114189/220170503-32638994-b509-4251-8aa1-d8393dda7184.png)

### Mark a PR as Manually Merged and close it

![image](https://user-images.githubusercontent.com/2114189/220170537-25c91b2c-7a9a-44d1-9e6a-ebe3f1dfc26a.png)

---------

Co-authored-by: Jason Song <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
1.18.5
Development

Successfully merging a pull request may close this issue.

Fix the Manually Merged form wxiaoguang/gitea
5 participants
@lunny @wxiaoguang @tautf @jolheiser @a-n-dokuchaev