Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix admin handling at merge of PR #9749

Merged
merged 11 commits into from
Jan 16, 2020
Merged

Conversation

davidsvantesson
Copy link
Contributor

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
Copy link

codecov-io commented Jan 13, 2020

Codecov Report

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

Impacted file tree graph

@@            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.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 13, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 13, 2020
@lunny lunny added the type/bug label Jan 14, 2020
@lunny lunny added this to the 1.12.0 milestone Jan 14, 2020
routers/private/hook.go Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 14, 2020
@lunny
Copy link
Member

lunny commented Jan 15, 2020

Please resolve the conflicts.

@davidsvantesson
Copy link
Contributor Author

@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.

# Conflicts:
#	templates/repo/issue/view_content/pull.tmpl
@davidsvantesson
Copy link
Contributor Author

@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.

Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

I removed the wrong location, fixed now.

@sapk
Copy link
Member

sapk commented Jan 16, 2020

Last change seems to fail on CI.

@lafriks lafriks merged commit 18e0447 into go-gitea:master Jan 16, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error 500 attempting to merge PR as admin
9 participants