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

everhopingandwaiting · 2020-04-04T09:25:15Z

see #10935

… merge white list go-gitea#10935 (cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

6543 · 2020-04-04T10:19:19Z

test's fail pleace correct tests 👍

everhopingandwaiting · 2020-04-04T11:15:53Z

test's fail pleace correct tests 👍

let me check check 🤔

guillep2k

In this PR you can check the tests link here:

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

Fix in my suggestion below.

services/pull/merge.go

codecov-io · 2020-04-04T23:39:22Z

Codecov Report

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

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

* Fix cross compile * Add test for cross compile * Fix drone * Fix drone * Also prevent CC environment not to generate Co-authored-by: zeripath <[email protected]>

that because need some space beturn ``text`` and color defines Signed-off-by: a1012112796 <[email protected]>

Signed-off-by: Andrew Thornton <[email protected]>

6543

good chatch! for the API

6543 · 2020-04-08T10:47:28Z

ping lgtm

… 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 <[email protected]> * fix merge box icon color bug (go-gitea#10974) that because need some space beturn ``text`` and color defines Signed-off-by: a1012112796 <[email protected]> * [skip ci] Updated translations via Crowdin * Allow X in addition to x in tasks (go-gitea#10979) Signed-off-by: Andrew Thornton <[email protected]> * remove api: merge reqRepoWriter Co-authored-by: zeripath <[email protected]> Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: 赵智超 <[email protected]> Co-authored-by: GiteaBot <[email protected]> Co-authored-by: techknowlogick <[email protected]> Co-authored-by: guillep2k <[email protected]>

[suggest] change merge strategy： do not check write access if user in…

fe6d2e3

… merge white list go-gitea#10935 (cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

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

lunny added the type/enhancement An improvement of existing functionality label Apr 4, 2020

lunny added this to the 1.12.0 milestone Apr 4, 2020

Merge branch 'master' into patch-2-merge-strategy-temp

4aa47e7

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 reviewed Apr 4, 2020

View reviewed changes

services/pull/merge.go Outdated Show resolved Hide resolved

everhopingandwaiting and others added 2 commits April 5, 2020 06:58

Merge branch 'master' into patch-2-merge-strategy-temp

cfd30af

fix NPE

7755e10

6543 approved these changes Apr 5, 2020

View reviewed changes

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

guillep2k approved these changes Apr 5, 2020

View reviewed changes

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

everhopingandwaiting and others added 2 commits April 5, 2020 12:44

Merge branch 'master' into patch-2-merge-strategy-temp

dff428f

Merge branch 'master' into patch-2-merge-strategy-temp

cbbb402

6543 mentioned this pull request Apr 6, 2020

[feature] provide OwnerName field for README template #10356

Closed

lunny and others added 6 commits April 6, 2020 08:22

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 <[email protected]>

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

dc1a473

that because need some space beturn ``text`` and color defines Signed-off-by: a1012112796 <[email protected]>

[skip ci] Updated translations via Crowdin

7f49034

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

87c4bc1

Signed-off-by: Andrew Thornton <[email protected]>

remove api: merge reqRepoWriter

6e94a61

Merge branch 'master' into patch-2-merge-strategy-temp

d931ea2

6543 approved these changes Apr 6, 2020

View reviewed changes

techknowlogick and others added 2 commits April 6, 2020 20:47

Merge branch 'master' into patch-2-merge-strategy-temp

fe38a93

Merge branch 'master' into patch-2-merge-strategy-temp

fa27e5b

everhopingandwaiting and others added 4 commits April 7, 2020 12:02

Merge branch 'master' into patch-2-merge-strategy-temp

fc0e25d

Merge branch 'master' into patch-2-merge-strategy-temp

0352a86

Merge branch 'master' into patch-2-merge-strategy-temp

ff1fb2e

Merge branch 'master' into patch-2-merge-strategy-temp

cf9bade

lafriks approved these changes Apr 8, 2020

View reviewed changes

lafriks merged commit b40107c into go-gitea:master Apr 8, 2020

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

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

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

Uh oh!

everhopingandwaiting commented Apr 4, 2020

Uh oh!

6543 commented Apr 4, 2020

Uh oh!

everhopingandwaiting commented Apr 4, 2020

Uh oh!

guillep2k left a comment

Uh oh!

Uh oh!

codecov-io commented Apr 4, 2020 •

edited

Loading

Uh oh!

6543 left a comment

Uh oh!

6543 commented Apr 8, 2020

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

everhopingandwaiting commented Apr 4, 2020

see #10935

Uh oh!

6543 commented Apr 4, 2020

Uh oh!

everhopingandwaiting commented Apr 4, 2020

Uh oh!

guillep2k left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov-io commented Apr 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

6543 left a comment

Choose a reason for hiding this comment

Uh oh!

6543 commented Apr 8, 2020

Uh oh!

Uh oh!

codecov-io commented Apr 4, 2020 •

edited

Loading