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 branch protection option to block merge on requested changes. #9592

Merged
merged 6 commits into from Jan 3, 2020

Conversation

@davidsvantesson
Copy link
Contributor

davidsvantesson commented Jan 2, 2020

Fix #9130.

Screenshot

image

@GiteaBot GiteaBot added the lgtm/need 2 label Jan 2, 2020
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
routers/private/hook.go Outdated Show resolved Hide resolved
davidsvantesson and others added 2 commits Jan 2, 2020
Language improvement.

Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>
@techknowlogick techknowlogick added this to the 1.11.0 milestone Jan 2, 2020
@bagasme

This comment has been minimized.

Copy link
Contributor

bagasme commented Jan 3, 2020

@davidsvantesson Supposed that test user has push new commits that address test3's requested change review, although the review doesn't have any suggested changes, is there a way to pass it?

@davidsvantesson

This comment has been minimized.

Copy link
Contributor Author

davidsvantesson commented Jan 3, 2020

@bagasme I am not sure what you mean. If test3 has requested changes that user then has to approve the PR to be able to merge it.

@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Jan 3, 2020
@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Jan 3, 2020
@lafriks
lafriks approved these changes Jan 3, 2020
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 3, 2020

Codecov Report

Merging #9592 into master will decrease coverage by <.01%.
The diff coverage is 20%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9592      +/-   ##
==========================================
- Coverage   42.15%   42.14%   -0.01%     
==========================================
  Files         577      578       +1     
  Lines       75985    76014      +29     
==========================================
+ Hits        32031    32038       +7     
- Misses      39977    40002      +25     
+ Partials     3977     3974       -3
Impacted Files Coverage Δ
models/migrations/migrations.go 1.3% <ø> (ø) ⬆️
modules/auth/repo_form.go 43.47% <ø> (ø) ⬆️
routers/private/hook.go 50.35% <0%> (-1.29%) ⬇️
routers/repo/issue.go 37.66% <0%> (-0.03%) ⬇️
models/migrations/v117.go 0% <0%> (ø)
routers/repo/setting_protected_branch.go 40.86% <100%> (+0.57%) ⬆️
models/branches.go 45.89% <35.71%> (-0.58%) ⬇️
modules/task/migrate.go 25% <0%> (-3.95%) ⬇️
models/error.go 32.71% <0%> (-1.11%) ⬇️
models/repo.go 47.97% <0%> (-0.11%) ⬇️
... 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 b39fab4...b2076f7. Read the comment docs.

@lafriks lafriks merged commit ea707f5 into go-gitea:master Jan 3, 2020
2 checks passed
2 checks passed
approvals/lgtm this commit looks good
continuous-integration/drone/pr Build is passing
Details
@davidsvantesson davidsvantesson deleted the davidsvantesson:block-on-requested-changes branch Jan 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
7 participants
You can’t perform that action at this time.