Skip to content

Conversation

@zeripath
Copy link
Contributor

@zeripath zeripath commented Jun 15, 2020

Backport #11713 on to 1.11

  • Fix verification of subkeys of default gpg key

Fix #10309

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

  • Remove debug log

  • Update models/gpg_key.go

  • As per @6543

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

Backport go-gitea#11713

* Fix verification of subkeys of default gpg key

Fix go-gitea#10309

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

* Remove debug log

* Update models/gpg_key.go

* As per @6543

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

Co-authored-by: techknowlogick <[email protected]>
@zeripath zeripath added this to the 1.11.7 milestone Jun 15, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 15, 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 Jun 15, 2020
@techknowlogick techknowlogick merged commit f79a2e1 into go-gitea:release/v1.11 Jun 15, 2020
@zeripath zeripath deleted the backport-11713 branch June 15, 2020 20:15
@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/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants