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

Move keys to models/asymkey #17917

Merged
merged 10 commits into from
Dec 10, 2021
Merged

Move keys to models/asymkey #17917

merged 10 commits into from
Dec 10, 2021

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 6, 2021

as title.

@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Dec 6, 2021
@lunny lunny changed the title Move keys to models/keys Move keys to models/asymkey Dec 6, 2021
@wxiaoguang
Copy link
Contributor

CI failure seems not related, LGTM

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 6, 2021
@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 Dec 10, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #17917 (0d6145f) into main (0a9fcf6) will decrease coverage by 0.04%.
The diff coverage is 38.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17917      +/-   ##
==========================================
- Coverage   45.37%   45.32%   -0.05%     
==========================================
  Files         817      819       +2     
  Lines       90806    90815       +9     
==========================================
- Hits        41200    41159      -41     
- Misses      43038    43111      +73     
+ Partials     6568     6545      -23
Impacted Files Coverage Δ
cmd/admin.go 0.00% <0.00%> (ø)
cmd/serv.go 2.46% <0.00%> (ø)
models/asymkey/gpg_key_add.go 29.26% <ø> (ø)
models/asymkey/gpg_key_common.go 59.67% <ø> (ø)
models/asymkey/gpg_key_import.go 60.00% <ø> (ø)
models/asymkey/gpg_key_verify.go 13.46% <ø> (ø)
models/asymkey/ssh_key_authorized_keys.go 16.00% <0.00%> (ø)
models/asymkey/ssh_key_authorized_principals.go 7.93% <ø> (ø)
models/asymkey/ssh_key_fingerprint.go 50.00% <ø> (ø)
models/asymkey/ssh_key_parse.go 62.50% <0.00%> (ø)
... and 64 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 0a9fcf6...0d6145f. Read the comment docs.

@lunny lunny merged commit 3ca5dc7 into go-gitea:main Dec 10, 2021
@lunny lunny deleted the lunny/model_keys branch December 10, 2021 08:14
@zeripath zeripath mentioned this pull request Feb 1, 2022
Closed
zeripath added a commit to zeripath/gitea that referenced this pull request Feb 1, 2022
@zeripath
Collaborator trust model should trust collaborators
7bb4ff8 
There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Feb 1, 2022
Merged
6543 pushed a commit that referenced this pull request Feb 2, 2022
@zeripath
Collaborator trust model should trust collaborators (#18539)
76e3111 
* Collaborator trust model should trust collaborators

There was an unintended regression in #17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix #18501

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this pull request Feb 2, 2022
@zeripath
Collaborator trust model should trust collaborators (go-gitea#18539)
f0f8a50 
Backport go-gitea#18539

There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Feb 2, 2022
Merged
techknowlogick pushed a commit that referenced this pull request Feb 3, 2022
@zeripath @lunny
Collaborator trust model should trust collaborators (#18539) (#18557)
bc196a3 
Backport #18539

There was an unintended regression in #17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix #18501

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@lunny
Move keys to models/asymkey (go-gitea#17917)
002ef9b 
* Move keys to models/keys

* Rename models/keys -> models/asymkey

* change the missed package name

* Fix package alias

* Fix test

* Fix docs

* Fix test

* Fix test

* merge
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@zeripath
Collaborator trust model should trust collaborators (go-gitea#18539)
303ddeb 
* Collaborator trust model should trust collaborators

There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@silverwind silverwind silverwind 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/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lunny @wxiaoguang @codecov-commenter @silverwind @GiteaBot