Icycoide/RSCC-Forge
1
0
Fork 0
forked from kevadesu/forgejo
Code Pull requests Activity

fix(hook): repo admins are wrongly denied the right to force merge

Browse source 
The right to force merge is uses the wrong predicate and
applies to instance admins:

  ctx.user.IsAdmin

It must apply to repository admins and use the following predicate:

 ctx.userPerm.IsAdmin()

This regression is from the ApplyToAdmins implementation in
79b7089360.

Fixes: https://codeberg.org/forgejo/forgejo/issues/3780
(cherry picked from commit 09f3518069)
This commit is contained in:
Earl Warren 2024-06-01 10:45:20 +02:00
parent baec3dc6b9
commit 2df082393e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
release-notes/8.0.0/fix/3976.md Normal file
View file

@ -0,0 +1 @@
- repository admins are always denied the right to force merge and instance admins are subject to restrictions to merge that must only apply to repository admins