Skip to content

Conversation

@zeripath
Copy link
Contributor

Fix #10309

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

@zeripath zeripath added this to the 1.13.0 milestone May 31, 2020
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 31, 2020
@zeripath
Copy link
Contributor Author

zeripath commented Jun 2, 2020

I'm suspicious that this may actually fix #10591 too

@6543
Copy link
Member

6543 commented Jun 2, 2020

@zeripath can you add a test for this case :)

zeripath added 3 commits June 2, 2020 21:45
Signed-off-by: Andrew Thornton <[email protected]>
…at-we-provide-subkeys-when-verifying-default-key
…-default-key' of github.com:zeripath/gitea into fix-10309-ensure-that-we-provide-subkeys-when-verifying-default-key
@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 Jun 2, 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 3, 2020
@techknowlogick
Copy link
Member

ping LG-TM

@techknowlogick techknowlogick merged commit a730dc1 into go-gitea:master Jun 3, 2020
@techknowlogick
Copy link
Member

@zeripath please send backport :)

@zeripath zeripath deleted the fix-10309-ensure-that-we-provide-subkeys-when-verifying-default-key branch June 3, 2020 16:05
zeripath added a commit to zeripath/gitea that referenced this pull request Jun 3, 2020
* 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 the backport/done All backports for this PR have been created label Jun 3, 2020
zeripath added a commit that referenced this pull request Jun 3, 2020
* 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]>
zeripath added a commit to zeripath/gitea that referenced this pull request Jun 15, 2020
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]>
techknowlogick added a commit that referenced this pull request Jun 15, 2020
Backport #11713

* 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]>

Co-authored-by: techknowlogick <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
* 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]>
@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

backport/done All backports for this PR have been created 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.

Instance GPG key not recognized if subkey

5 participants