No button to merge PR

[AntouanK]

• Gitea version (or commit ref): a2a49c9
• Git version: 2.15.0
• Operating system: docker
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes (provide example URL)
  • No
  • Not relevant
• Log gist:

Description

Cannot merge PR anymore!
I pulled the latest docker image earlier today.
Now, when I open a PR in any private repo, there's no button to merge it! Am I missing something?
Seems like it's related to this commit a2a49c9 ?

Screenshots

[lafriks]

Is master branch protected?

[AntouanK]

Yes, and develop. But from direct commits. Not PRs
I had it like that in previous versions and it worked fine.

[lunny]

Do you in whitelist on protected branch?

[AntouanK]

No, I didn't add anything in the whitelist.

[lunny]

Yes. #3544 ask you have to add the people who has permission to merge pull request, not repo writers any more.

[lafriks]

@lunny this should probably be changed if noone is specified in whitelist than everyone can merge, otherwise it will break a lot of instances

[lunny]

We need a migration?

[lafriks]

@lunny no just add if non are defined than everyone with write rights can merge

[lunny]

@lafriks but that's conflict with the push policy.

[lafriks]

@lunny kind of, direct push is still not possible. GitHub also allow merge to protected branches for writers but does not allow direct pushes.
Currently it is possible to allow merge for everyone with write rights only by keeping this list manually up to date that is not best option and will confuse many users as it was working for them in up to 1.4.x

[lafriks]

Also it is currently not possible to set that users can merge but not push directly. As if adding user to whitelist will actually make branch protection a bit useless... I think we have made it worse with #3544 than it was before...

[Chri-s]

What would be a good solution? Adding a second whitelist for users which are allowed to merge but not to push directly to the branch? And perhaps allowing everyone with write access to merge if both whitelists are empty?

For my workflow it is important that some users have write access to the repository but don't have any chance to push or merge into the protected branches.

[lunny]

@Chri-s @lafriks add a whitelist to set who can merge pull request. And then the old whitelist is only who can push directly. The new whitelist is optional, if it is not checked, then the people who can push directly could merge pull request like currently master version. And it's default not checked for compitable. So that both your requirement could be resolved.