Error 500 attempting to merge PR as admin #4636

New Issue

GiteaMirror · 2025-11-02T05:56:58-06:00

GiteaMirror commented

2025-11-02 05:56:58 -06:00

Originally created by @guillep2k on GitHub (Jan 12, 2020).

Gitea version (or commit ref): 2ecf98ed2d

Description

When I attempt to merge a PR that doesn't have enough approvals, the [Merge] button shows up in red and the message "As an administrator, you may still merge this pull request" is displayed. However, when I push the [Merge] button, a 500 Server Error page shows up with the following error:

git push: remote: Gitea: Not allowed to push to protected branch master and pr #68 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals]        
To /home/giteatest/gitea-repositories/user2/miomiomio.git
 ! [remote rejected] base -> master (pre-receive hook declined)
error: failed to push some refs to '/home/giteatest/gitea-repositories/user2/miomiomio.git'

Stack trace:

2020/01/12 20:36:05 ...ters/private/hook.go:145:HookPreReceive() [W] Forbidden: User 39 is not allowed push to protected branch master in 82473
8599184:user2/miomiomio and pr #1 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals]
2020/01/12 20:36:05 routers/repo/pull.go:712:MergePullRequest() [E] Merge: git push: remote: Gitea: Not allowed to push to protected branch mas
ter and pr #68 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals]
    To /home/giteatest/gitea-repositories/user2/miomiomio.git
     ! [remote rejected] base -> master (pre-receive hook declined)
    error: failed to push some refs to '/home/giteatest/gitea-repositories/user2/miomiomio.git'

    /home/guillep2k/src/code.gitea.io/gitea/routers/repo/pull.go:712 (0x1471838)
        MergePullRequest: ctx.ServerError("Merge", err)
    /home/guillep2k/go/src/reflect/value.go:460 (0x49e935)
        Value.call: call(frametype, fn, args, uint32(frametype.size), uint32(retOffset))
    /home/guillep2k/go/src/reflect/value.go:321 (0x49e0f3)
        Value.Call: return v.call("Call", in)
    /home/v/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:177 (0x9bc749)
        (*injector).callInvoke: return reflect.ValueOf(f).Call(in), nil
    (etc)

User 39 is the owner of the repository and the user I'm logged in for the merge operation.

Originally created by @guillep2k on GitHub (Jan 12, 2020). - Gitea version (or commit ref): 2ecf98ed2d10aea4f1b4ba31887aa52b479c1317 ## Description When I attempt to merge a PR that doesn't have enough approvals, the `[Merge]` button shows up in red and the message _"As an administrator, you may still merge this pull request"_ is displayed. However, when I push the `[Merge]` button, a `500 Server Error` page shows up with the following error: ``` git push: remote: Gitea: Not allowed to push to protected branch master and pr #68 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals] To /home/giteatest/gitea-repositories/user2/miomiomio.git ! [remote rejected] base -> master (pre-receive hook declined) error: failed to push some refs to '/home/giteatest/gitea-repositories/user2/miomiomio.git' ``` Stack trace: ``` 2020/01/12 20:36:05 ...ters/private/hook.go:145:HookPreReceive() [W] Forbidden: User 39 is not allowed push to protected branch master in 82473 8599184:user2/miomiomio and pr #1 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals] 2020/01/12 20:36:05 routers/repo/pull.go:712:MergePullRequest() [E] Merge: git push: remote: Gitea: Not allowed to push to protected branch mas ter and pr #68 is not ready to be merged: not allowed to merge [reason: Does not have enough approvals] To /home/giteatest/gitea-repositories/user2/miomiomio.git ! [remote rejected] base -> master (pre-receive hook declined) error: failed to push some refs to '/home/giteatest/gitea-repositories/user2/miomiomio.git' /home/guillep2k/src/code.gitea.io/gitea/routers/repo/pull.go:712 (0x1471838) MergePullRequest: ctx.ServerError("Merge", err) /home/guillep2k/go/src/reflect/value.go:460 (0x49e935) Value.call: call(frametype, fn, args, uint32(frametype.size), uint32(retOffset)) /home/guillep2k/go/src/reflect/value.go:321 (0x49e0f3) Value.Call: return v.call("Call", in) /home/v/src/code.gitea.io/gitea/vendor/gitea.com/macaron/inject/inject.go:177 (0x9bc749) (*injector).callInvoke: return reflect.ValueOf(f).Call(in), nil (etc) ``` User `39` is the owner of the repository and the user I'm logged in for the merge operation.

GiteaMirror added the skip-changelog type/bug labels 2025-11-02 05:56:58 -06:00

GiteaMirror closed this issue

2025-11-02 05:56:59 -06:00

GiteaMirror commented

2025-11-02 05:57:00 -06:00

@zeripath commented on GitHub (Jan 13, 2020):

80bfd5145c/routers/private/hook.go (L143-L144)

The specific override would have to go here or the line below.

@zeripath commented on GitHub (Jan 13, 2020): https://github.com/go-gitea/gitea/blob/80bfd5145c7b159ebdad3746efe11378b282fa86/routers/private/hook.go#L143-L144 The specific override would have to go here or the line below.

GiteaMirror commented

2025-11-02 05:57:01 -06:00

@zeripath commented on GitHub (Jan 13, 2020):

@davidsvantesson you did not understand that the hook always runs.

80bfd5145c/routers/private/hook.go (L101-L102)

This is not true. In fact if you have the protectedbranchid set it's not a manual merge!!

@zeripath commented on GitHub (Jan 13, 2020): @davidsvantesson you did not understand that the hook always runs. https://github.com/go-gitea/gitea/blob/80bfd5145c7b159ebdad3746efe11378b282fa86/routers/private/hook.go#L101-L102 This is not true. In fact if you have the protectedbranchid set it's not a manual merge!!

GiteaMirror commented

2025-11-02 05:57:01 -06:00

@davidsvantesson commented on GitHub (Jan 13, 2020):

Ohh. Is there any way to know if it was done from the UI?

@davidsvantesson commented on GitHub (Jan 13, 2020): Ohh. Is there any way to know if it was done from the UI?

GiteaMirror commented

2025-11-02 05:57:01 -06:00

@davidsvantesson commented on GitHub (Jan 13, 2020):

The previous code didn't even check if status checks was ok, so it didn't prevent admins (or anyone) to merge.

@zeripath So we never allow manual merges, unless user has push rights to branch? (I.e. a user with merge rights has to use the UI or API, not trying to manual merge and push). It is a bit hard to follow the code when it makes internal requests 😕 😊

In that case this code might even be a bit double as the check is done before merge is done. Anyhow it should be an easy fix to just check if user is admin.

@davidsvantesson commented on GitHub (Jan 13, 2020): The previous code didn't even check if status checks was ok, so it didn't prevent admins (or anyone) to merge. @zeripath So we never allow manual merges, unless user has push rights to branch? (I.e. a user with merge rights has to use the UI or API, not trying to manual merge and push). It is a bit hard to follow the code when it makes internal requests :confused: :blush: In that case this code might even be a bit double as the check is done before merge is done. Anyhow it should be an easy fix to just check if user is admin.

GiteaMirror referenced this issue

2025-11-02 13:23:20 -06:00

[PR #4636] [MERGED] Show review comment box only on a pull request page #17439

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#4636