Fix admin handling at merge of PR

[davidsvantesson]

Fix #9739

• Admin shall be able to merge even if all checks are not ready (fix hook)
• If merge whitelist is explicitly set, admin should not be able to merge if not in whitelist. At least I didn't intended that change.

[codecov-io]

Codecov Report

Merging #9749 into master will increase coverage by 0.01%.
The diff coverage is 69.51%.

@@            Coverage Diff             @@
##           master    #9749      +/-   ##
==========================================
+ Coverage   42.19%   42.21%   +0.01%     
==========================================
  Files         603      603              
  Lines       78861    78879      +18     
==========================================
+ Hits        33278    33301      +23     
+ Misses      41501    41497       -4     
+ Partials     4082     4081       -1

Impacted Files	Coverage Δ
services/mailer/mail.go	46.52% <0%> (ø)	⬆️
modules/notification/webhook/webhook.go	37.97% <100%> (ø)	⬆️
modules/notification/action/action.go	35.65% <100%> (ø)	⬆️
services/pull/merge.go	50.69% <100%> (ø)	⬆️
services/pull/check.go	54.54% <100%> (+2.09%)	⬆️
modules/notification/base/null.go	62.5% <100%> (ø)	⬆️
modules/notification/notification.go	73.33% <100%> (ø)	⬆️
modules/notification/mail/mail.go	24.63% <100%> (ø)	⬆️
modules/notification/ui/ui.go	74.46% <100%> (ø)	⬆️
routers/repo/compare.go	40.67% <30%> (+1.03%)	⬆️
... and 9 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d9b9a76...cbd94dd. Read the comment docs.

[lunny]

Please resolve the conflicts.

[davidsvantesson]

@zeripath Can you check my comments in #9708? (sorry didn't have time to review before it was merged). I don't know how to resolve the conflicts on 136-137, line 136 seem to have no effect what I can see.

[davidsvantesson]

@zeripath I renamed $notAllOk to $notAllOverrideableChecksOk, I think it will be more clear. It should also be more clear if signed commits shall be overrideable in the future, so I don't think the term is needed there now.

[zeripath]

Require signed commits here is being overrided by being the admin. If you actually intend that then you will need to change the code in pre-receive hook earlier where it checks that.

[davidsvantesson]

I removed the wrong location, fixed now.

[sapk]

Last change seems to fail on CI.