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

Add block on official review requests branch protection #13705

Merged

Conversation

a1012112796
Copy link
Member

releated to #13655

add block on official review requests as an stand-alone option in branch proection, add show different message on ui

example view:
2020-11-26 17-48-29屏幕截图

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 26, 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 Nov 28, 2020
@lafriks lafriks added the type/enhancement An improvement of existing functionality label Nov 28, 2020
@lafriks lafriks added this to the 1.14.0 milestone Nov 28, 2020
@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 Nov 28, 2020
@codecov-io
Copy link

Codecov Report

Merging #13705 (00da2da) into master (7ed5bf8) will increase coverage by 0.00%.
The diff coverage is 72.58%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #13705   +/-   ##
=======================================
  Coverage   42.20%   42.21%           
=======================================
  Files         697      698    +1     
  Lines       76848    76872   +24     
=======================================
+ Hits        32434    32449   +15     
- Misses      39062    39070    +8     
- Partials     5352     5353    +1     
Impacted Files Coverage Δ
models/migrations/migrations.go 2.44% <ø> (ø)
models/migrations/v160.go 0.00% <0.00%> (ø)
modules/auth/repo_form.go 39.83% <ø> (ø)
routers/repo/issue.go 38.06% <0.00%> (-0.03%) ⬇️
services/pull/merge.go 49.18% <0.00%> (-0.41%) ⬇️
models/branches.go 41.36% <25.00%> (-0.53%) ⬇️
modules/convert/convert.go 74.89% <100.00%> (+0.10%) ⬆️
routers/api/v1/repo/branch.go 38.50% <100.00%> (+0.48%) ⬆️
routers/repo/setting_protected_branch.go 43.01% <100.00%> (+0.32%) ⬆️
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
... and 5 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 7ed5bf8...00da2da. Read the comment docs.

@lafriks lafriks merged commit 9c26dc1 into go-gitea:master Nov 28, 2020
@a1012112796 a1012112796 deleted the block_merge_on_offical_review_request branch November 29, 2020 08:48
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
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/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants