PR - "Manually merged" button stopped working in 1.17 #695

Open
opened 2 months ago by vanous · 7 comments

The Manually merged button:

image

in PRs seems to do nothing after i click it. I was never able to use it properly before either, because the provided hash never seemed to work :), but that is a different story :)

Tested in Firefox 03.0 (64-bit), Chromium Version 104.0.5112.79 (Official Build) built on Debian bookworm/sid, running on Debian bookworm/sid (64-bit) and also on latest Chrome.

I have seen this happen on multiple PRs. When i try to to make a test to replicate it in a clean repo (outside of Gadgetbridge), i cannot make the "Manually merged" to appear on my test PRs in my clone... i do have the "Enable Mark PRs as manually merged" enabled.

image

We have two PRs that we can test/see this on:

Freeyourgadget/Gadgetbridge#2392

Freeyourgadget/Gadgetbridge#2776

The Manually merged button: ![image](/attachments/c8185776-de30-4d70-a651-990ac49eedfd) in PRs seems to do nothing after i click it. I was never able to use it properly before either, because the provided hash never seemed to work :), but that is a different story :) Tested in Firefox 03.0 (64-bit), Chromium Version 104.0.5112.79 (Official Build) built on Debian bookworm/sid, running on Debian bookworm/sid (64-bit) and also on latest Chrome. I have seen this happen on multiple PRs. When i try to to make a test to replicate it in a clean repo (outside of Gadgetbridge), i cannot make the "Manually merged" to appear on my test PRs in my clone... i do have the "Enable Mark PRs as manually merged" enabled. ![image](/attachments/caf0399b-7805-4afe-9c66-7d0cd1a1a694) We have two PRs that we can test/see this on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2392 https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2776
3.4 KiB
5.2 KiB
Collaborator

I think I heard of this regression already somewhere. Can you check the upstream Gitea issue tracker if already reported / WIP?

I think I heard of this regression already somewhere. Can you check the upstream Gitea issue tracker if already reported / WIP?
Poster

I cannot find it upstream (hope i did not miss this), but we discussed it recently shortly with @ashimokawa so maybe he mentioned it?

I cannot find it upstream (hope i did not miss this), but we discussed it recently shortly with @ashimokawa so maybe he mentioned it?

I did not report upstream and I cannot find it upstream, but yes, for me it is broken.

I mentioned it to a few people but not publically.

I did not report upstream and I cannot find it upstream, but yes, for me it is broken. I mentioned it to a few people but not publically.

For those looking for a temporary solution: The form for the commit SHA is there, you just need to remove the display: none; property on it

For those looking for a temporary solution: The form for the commit SHA is there, you just need to remove the `display: none;` property on it
Poster

Yes, this works!

Yes, this works!

Update: this issue seems to come from upstream. If you go to try.gitea.io and try it out there, it won't work either. I've opened the issue in the upstream repo: https://github.com/go-gitea/gitea/issues/20983

**Update:** this issue seems to come from upstream. If you go to [try.gitea.io](https://try.gitea.io/) and try it out there, it won't work either. I've opened the issue in the upstream repo: https://github.com/go-gitea/gitea/issues/20983

The form for the commit SHA is there, you just need to remove the display: none; property on it

This issue seems to come from upstream.

Aaand I've been able to find where the bug is. Basically, the script for un-hiding the commit SHA input field was removed in favour of a Vue component, but it doesn't get initialized if the pull request can't be merged (which is precisely what happens when the target branch contains the source branch)

> The form for the commit SHA is there, you just need to remove the `display: none;` property on it > This issue seems to come from upstream. Aaand I've been able to find where the bug is. Basically, [the script for un-hiding the commit SHA input field was removed in favour of a Vue component](https://github.com/go-gitea/gitea/commit/368baf9e77606e5de8bbcda8b0348f1a6fba6d73#diff-d39a63ccfd5f0fe703f74ce48a3624ba59a856317b0d236d7eae87dfcf6c1c20L240-L246), but it doesn't get initialized if the pull request can't be merged (which is precisely what happens when the target branch contains the source branch)
rwa added the
gitea-related
upstream
labels 1 month ago
Sign in to join this conversation.
No Milestone
No Assignees
4 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Codeberg/Community#695
Loading…
There is no content yet.