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

[suggest] change merge strategy： do not check write access if user in merge white list #10951

Merged
merged 18 commits into from Apr 8, 2020
Merged

[suggest] change merge strategy： do not check write access if user in merge white list #10951

merged 18 commits into from Apr 8, 2020

Conversation

everhopingandwaiting
Copy link
Contributor

see #10935

@everhopingandwaiting
[suggest] change merge strategy： do not check write access if user in…
fe6d2e3 
… merge white list go-gitea#10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)
@6543
Copy link
Member

6543 commented Apr 4, 2020

test's fail pleace correct tests 👍

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 4, 2020
@everhopingandwaiting
Copy link
Contributor Author

test's fail pleace correct tests 👍

let me check check 🤔

@lunny lunny added the type/enhancement An improvement of existing functionality label Apr 4, 2020
@lunny lunny added this to the 1.12.0 milestone Apr 4, 2020
@guillep2k guillep2k linked an issue Apr 4, 2020 that may be closed by this pull request
[suggest] change merge strategy： do not check write access if user in merge white list #10935
Closed
7 tasks
guillep2k
guillep2k reviewed Apr 4, 2020
View reviewed changes
Copy link
Member

@guillep2k guillep2k left a comment

Choose a reason for hiding this comment

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

In this PR you can check the tests link here:

image

If you follow the link, you will find that the error happens here:

image

Fix in my suggestion below.

services/pull/merge.go Outdated Show resolved Hide resolved
@codecov-io
Copy link

codecov-io commented Apr 4, 2020 •
edited

Codecov Report

Merging #10951 into master will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10951      +/-   ##
==========================================
+ Coverage   43.38%   43.41%   +0.02%     
==========================================
  Files         597      597              
  Lines       84527    84524       -3     
==========================================
+ Hits        36675    36696      +21     
+ Misses      43325    43307      -18     
+ Partials     4527     4521       -6
Impacted Files Coverage Δ
routers/api/v1/api.go 76.37% <100.00%> (ø)
routers/routes/routes.go 86.58% <100.00%> (-0.02%) ⬇️
services/pull/merge.go 50.74% <100.00%> (+<0.01%) ⬆️
models/repo_mirror.go 2.12% <0.00%> (-10.64%) ⬇️
services/mirror/mirror.go 18.75% <0.00%> (-0.66%) ⬇️
services/pull/pull.go 34.70% <0.00%> (-0.30%) ⬇️
modules/git/repo.go 48.11% <0.00%> (+0.83%) ⬆️
modules/queue/workerpool.go 59.43% <0.00%> (+1.42%) ⬆️
services/pull/check.go 55.48% <0.00%> (+2.43%) ⬆️
... and 6 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 ecb1768...fc0e25d. Read the comment docs.

@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 Apr 5, 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 Apr 5, 2020
@6543 6543 mentioned this pull request Apr 6, 2020
Closed
lunny and others added 6 commits April 6, 2020 08:22
@lunny @zeripath @everhopingandwaiting
Fix cross compile (go-gitea#10952)
f1edeb9 
* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <art27@cantab.net>
@a1012112796 @everhopingandwaiting
fix merge box icon color bug (go-gitea#10974)
dc1a473 
that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <1012112796@qq.com>
@GiteaBot @everhopingandwaiting
[skip ci] Updated translations via Crowdin
7f49034
@zeripath @everhopingandwaiting
Allow X in addition to x in tasks (go-gitea#10979)
87c4bc1 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@everhopingandwaiting
remove api: merge reqRepoWriter
6e94a61
@everhopingandwaiting
Merge branch 'master' into patch-2-merge-strategy-temp
d931ea2
6543
6543 approved these changes Apr 6, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

good chatch! for the API

@6543
Copy link
Member

6543 commented Apr 8, 2020

ping lgtm

@lafriks lafriks merged commit b40107c into go-gitea:master Apr 8, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@everhopingandwaiting @zeripath
@lunny @a1012112796 @GiteaBot @techknowlogick @guillep2k
[suggest] change merge strategy： do not check write access if user in…
1edb7a7 
… merge white list (go-gitea#10951)

* [suggest] change merge strategy： do not check write access if user in merge white list go-gitea#10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (go-gitea#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <art27@cantab.net>

* fix merge box icon color bug (go-gitea#10974)

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <1012112796@qq.com>

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (go-gitea#10979)

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

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 赵智超 <1012112796@qq.com>
Co-authored-by: GiteaBot <teabot@gitea.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.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

@guillep2k guillep2k guillep2k approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
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
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.

[suggest] change merge strategy： do not check write access if user in merge white list
10 participants
@everhopingandwaiting @6543 @codecov-io @lafriks @guillep2k @lunny @GiteaBot @zeripath @a1012112796 @techknowlogick