Skip to content

[Enhancement] Allow admin to merge pr with protected file changes #12078

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
Merged
merged 35 commits into from
Oct 13, 2020
Merged

[Enhancement] Allow admin to merge pr with protected file changes #12078

merged 35 commits into from
Oct 13, 2020

Conversation

@a1012112796
Copy link
Member

@a1012112796 a1012112796 commented Jun 28, 2020

As tilte, show protected message in diff page and merge box.

view:
tmp1

tmp2

@a1012112796
[Enhancement] Allow admin to merge pr with protected file changes
f6dfa21 
As tilte, show protected message in diff page and merge box.

Signed-off-by: a1012112796 <1012112796@qq.com>
@a1012112796
Merge branch 'master' into protected_files
9d64570
@a1012112796
remove unused ver
cc7b2ea
@techknowlogick techknowlogick added the type/enhancement An improvement of existing functionality label Jun 28, 2020
@techknowlogick techknowlogick added this to the 1.13.0 milestone Jun 28, 2020
CirnoT
CirnoT reviewed Jun 28, 2020
View reviewed changes
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 28, 2020
@techknowlogick @CirnoT
Update options/locale/locale_en-US.ini
da514ca 
Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
@lafriks
Copy link
Member

lafriks commented Jun 29, 2020

You should probably add UI text for singular and plural changed files with .TrN

@codecov-commenter
Copy link

codecov-commenter commented Aug 20, 2020 •
edited
Loading

Codecov Report

Merging #12078 into master will decrease coverage by 0.05%.
The diff coverage is 25.89%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12078      +/-   ##
==========================================
- Coverage   42.84%   42.79%   -0.06%     
==========================================
  Files         662      663       +1     
  Lines       73002    73103     +101     
==========================================
+ Hits        31279    31281       +2     
- Misses      36652    36737      +85     
- Partials     5071     5085      +14
Impacted Files Coverage Δ
models/migrations/migrations.go 2.46% <ø> (ø)
models/migrations/v153.go 0.00% <0.00%> (ø)
models/pull.go 54.54% <ø> (-0.63%) ⬇️
modules/repofiles/update.go 37.08% <ø> (ø)
modules/setting/repository.go 56.36% <ø> (ø)
routers/api/v1/repo/branch.go 36.85% <0.00%> (-0.58%) ⬇️
routers/repo/issue.go 36.65% <0.00%> (-0.08%) ⬇️
routers/repo/pull.go 33.21% <0.00%> (-0.33%) ⬇️
routers/repo/setting_protected_branch.go 42.69% <0.00%> (-0.74%) ⬇️
services/gitdiff/gitdiff.go 72.85% <ø> (ø)
... and 22 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 f404bdd...3e27c68. Read the comment docs.

lafriks
lafriks reviewed Sep 4, 2020
View reviewed changes
lafriks
lafriks reviewed Sep 4, 2020
View reviewed changes
lafriks
lafriks reviewed Sep 4, 2020
View reviewed changes
zeripath
zeripath reviewed Sep 5, 2020
View reviewed changes
@a1012112796 @zeripath
Update options/locale/locale_en-US.ini
fcd4ce5 
Co-authored-by: zeripath <art27@cantab.net>
zeripath
zeripath reviewed Sep 5, 2020
View reviewed changes
zeripath
zeripath reviewed Sep 5, 2020
View reviewed changes
routers/private/hook.go Outdated
protectedFilePath string
)

// Check Protected file pattern

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

Copy link
Contributor

@zeripath zeripath Oct 12, 2020

Choose a reason for hiding this comment

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

So I think it's now possible that the result of pull_service.CheckPRReadyToMerge(pr) may actually be incorrect - in that the changeProtectedFiles bit of it might be out-of-date. I think we're gonna need to drop that check from CheckPRReadyToMerge or avoid it somehow.

@a1012112796
Apply suggestions from code review
ea67165 
* move pr proteced files check to TestPatch
* Call TestPatch when protected branches settings changed
@a1012112796
Merge branch 'master' into protected_files
3fe9e97
@lunny
Copy link
Member

lunny commented Sep 11, 2020

Please resolve the conflicts.

@lunny
Copy link
Member

lunny commented Sep 18, 2020

Please don't add all codes to models. I think those codes could be in services.

@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 Sep 21, 2020
@codecov-io
Copy link

codecov-io commented Oct 12, 2020 •
edited
Loading

Codecov Report

Merging #12078 into master will decrease coverage by 0.05%.
The diff coverage is 23.20%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12078      +/-   ##
==========================================
- Coverage   42.37%   42.32%   -0.06%     
==========================================
  Files         676      677       +1     
  Lines       74531    74628      +97     
==========================================
+ Hits        31584    31585       +1     
- Misses      37814    37901      +87     
- Partials     5133     5142       +9
Impacted Files Coverage Δ
models/migrations/migrations.go 2.44% <ø> (ø)
models/migrations/v155.go 0.00% <0.00%> (ø)
models/pull.go 54.54% <ø> (-0.63%) ⬇️
modules/repofiles/update.go 37.08% <ø> (ø)
routers/api/v1/repo/branch.go 36.85% <0.00%> (-0.58%) ⬇️
routers/api/v1/repo/pull.go 25.05% <0.00%> (ø)
routers/repo/issue.go 34.92% <0.00%> (-0.07%) ⬇️
routers/repo/pull.go 33.29% <0.00%> (-0.33%) ⬇️
routers/repo/setting_protected_branch.go 42.69% <0.00%> (-0.74%) ⬇️
services/gitdiff/gitdiff.go 74.48% <ø> (+1.63%) ⬆️
... and 18 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 da32d0e...538317e. Read the comment docs.

zeripath
zeripath reviewed Oct 12, 2020
View reviewed changes
@zeripath
slightly restructure routers/private/hook.go
2adda2d 
Adds a lot of comments and simplifies the logic

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Merge remote-tracking branch 'origin/master' into protected_files
c50a2ed
@zeripath
placate lint
9a7c9c5 
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
zeripath reviewed Oct 13, 2020
View reviewed changes
a1012112796 and others added 6 commits October 13, 2020 19:06
@a1012112796
skip duplicate protected files check
2dc3c6d
@a1012112796
fix check logic
350b482
@zeripath
slight refactor of TestPatch
741bf9f 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
When checking for protected files changes in TestPatch use the tempor…
0c63499 
…ary repository

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
fix introduced issue with hook
3e24686 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Merge branch 'master' into protected_files
538317e
@zeripath
Copy link
Contributor

zeripath commented Oct 13, 2020

OK I think I'm done adjusting this now!

@zeripath
Remove the check on PR index being greater than 0 as it unnecessary
62e55c5 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@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 Oct 13, 2020
@techknowlogick techknowlogick merged commit dfa7291 into go-gitea:master Oct 13, 2020
@a1012112796 a1012112796 deleted the protected_files branch October 14, 2020 02:17
@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

@techknowlogick techknowlogick techknowlogick approved these changes

@lafriks lafriks lafriks approved these changes

+2 more reviewers

@CirnoT CirnoT CirnoT left review comments

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements

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

Development

Successfully merging this pull request may close these issues.

9 participants

@a1012112796 @lafriks @codecov-commenter @lunny @CirnoT @codecov-io @zeripath @techknowlogick @GiteaBot