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.

Sign up for GitHub

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

Jump to bottom

Default empty merger list to those with write permissions #12535

Merged
merged 2 commits into from
Aug 20, 2020
Merged

Default empty merger list to those with write permissions #12535

merged 2 commits into from
Aug 20, 2020

Conversation

zeripath
Copy link
Contributor

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
Default empty merger list to those with write permissions
f984f61 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.13.0 milestone Aug 19, 2020
@codecov-commenter
Copy link

codecov-commenter commented Aug 19, 2020 •
edited
Loading

Codecov Report

Merging #12535 into master will increase coverage by 0.00%.
The diff coverage is 42.85%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #12535   +/-   ##
=======================================
  Coverage   43.50%   43.50%           
=======================================
  Files         642      642           
  Lines       71010    71013    +3     
=======================================
+ Hits        30892    30897    +5     
- Misses      35108    35110    +2     
+ Partials     5010     5006    -4
Impacted Files Coverage Δ
modules/convert/convert.go 76.61% <0.00%> (-0.84%) ⬇️
models/branches.go 43.01% <100.00%> (ø)
services/pull/merge.go 50.14% <100.00%> (ø)
modules/log/event.go 56.60% <0.00%> (-2.84%) ⬇️
modules/indexer/stats/db.go 60.86% <0.00%> (ø)
modules/git/repo.go 49.74% <0.00%> (+0.50%) ⬆️
models/gpg_key.go 55.17% <0.00%> (+0.59%) ⬆️
modules/queue/unique_queue_disk_channel.go 55.38% <0.00%> (+1.53%) ⬆️
modules/git/utils.go 77.04% <0.00%> (+3.27%) ⬆️
modules/util/timer.go 85.71% <0.00%> (+42.85%) ⬆️

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 dcb543a...8877a40. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 19, 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 Aug 19, 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 Aug 20, 2020
@lunny
Copy link
Member

lunny commented Aug 20, 2020 •
edited by zeripath
Loading

Replace #12538

@lafriks lafriks merged commit d15bb17 into go-gitea:master Aug 20, 2020
@lafriks
Copy link
Member

lafriks commented Aug 20, 2020

Please send backport

@zeripath zeripath mentioned this pull request Aug 20, 2020
Closed
@zeripath zeripath deleted the fix-whitelist-issue branch August 20, 2020 09:07
zeripath added a commit to zeripath/gitea that referenced this pull request Aug 22, 2020
@zeripath @lunny
Default empty merger list to those with write permissions (go-gitea#1…
cd6b02d 
…2535)

Backport go-gitea#12535

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@zeripath zeripath mentioned this pull request Aug 22, 2020
Merged
@zeripath zeripath added the backport/done All backports for this PR have been created label Aug 22, 2020
lafriks pushed a commit that referenced this pull request Aug 22, 2020
@zeripath @lunny
Default empty merger list to those with write permissions (#12535) (#…
a687980 
…12560)

Backport #12535

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@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.
Reviewers

@lafriks lafriks lafriks approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @codecov-commenter @lunny @lafriks @GiteaBot