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.

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

Allow addition of gpg keyring with multiple keys #12487

Merged
merged 2 commits into from
Aug 21, 2020

Conversation

zeripath
Copy link
Contributor

Related #6778

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

Related go-gitea#6778

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Aug 13, 2020
@zeripath zeripath added this to the 1.13.0 milestone Aug 13, 2020
@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2020

Codecov Report

Merging #12487 into master will increase coverage by 0.01%.
The diff coverage is 23.52%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12487      +/-   ##
==========================================
+ Coverage   43.48%   43.50%   +0.01%     
==========================================
  Files         642      643       +1     
  Lines       71040    71142     +102     
==========================================
+ Hits        30893    30949      +56     
- Misses      35136    35191      +55     
+ Partials     5011     5002       -9     
Impacted Files Coverage Δ
models/migrations/migrations.go 4.66% <ø> (ø)
models/migrations/v147.go 0.00% <0.00%> (ø)
routers/user/setting/keys.go 10.67% <0.00%> (-0.67%) ⬇️
services/pull/review.go 47.74% <0.00%> (ø)
models/gpg_key.go 54.81% <64.15%> (+0.23%) ⬆️
routers/api/v1/user/gpg_key.go 64.15% <100.00%> (ø)
modules/indexer/stats/queue.go 64.70% <0.00%> (-11.77%) ⬇️
modules/indexer/stats/db.go 43.47% <0.00%> (-8.70%) ⬇️
services/pull/pull.go 42.03% <0.00%> (+0.46%) ⬆️
... and 13 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 ae23bbd...dbf3c07. 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 13, 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 20, 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 21, 2020
@lafriks lafriks merged commit 7c2cf23 into go-gitea:master Aug 21, 2020
@zeripath zeripath deleted the allow-multiple-keyrings branch September 13, 2020 12:30
@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.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants