Skip to content

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Apr 20, 2022

- Add a return for the first "block" of errors, which fixes the double
error messages.
- Add a return for `externallyManaged`.
- Resolves go-gitea#19398
@Gusted Gusted added this to the 1.17.0 milestone Apr 20, 2022
@Gusted Gusted added type/bug modifies/api This PR adds API routes or modifies them backport/v1.16 labels Apr 20, 2022
Gusted pushed a commit to Gusted/gitea that referenced this pull request Apr 20, 2022
- Backport go-gitea#19443
  - Add a return for the first "block" of errors, which fixes the double error messages.
  - Add a return for `externallyManaged`.
  - Resolves go-gitea#19398
@Gusted Gusted added the backport/done All backports for this PR have been created label Apr 20, 2022
@6543
Copy link
Member

6543 commented Apr 20, 2022

@Gusted can you add an test?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 20, 2022
@Gusted
Copy link
Contributor Author

Gusted commented Apr 20, 2022

@Gusted can you add an test?

I'm not sure what to test, I didn't touch the logic, only the return parts, which shouldn't change anything(other than the double error messages + prevention of deletion external SSH keys).

@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 Apr 20, 2022
@6543 6543 requested a review from delvh April 20, 2022 18:19
zeripath pushed a commit that referenced this pull request Apr 20, 2022
- Backport #19443
  - Add a return for the first "block" of errors, which fixes the double error messages.
  - Add a return for `externallyManaged`.
  - Resolves #19398

Co-authored-by: 6543 <[email protected]>
@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 Apr 21, 2022
@6543
Copy link
Member

6543 commented Apr 21, 2022

.

@6543 6543 merged commit f4c1aa7 into go-gitea:main Apr 21, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 21, 2022
* giteaofficial/main:
  Fix logging of Transfer API (go-gitea#19456)
  RepoAssignment ensure to close before overwrite (go-gitea#19449)
  node12 is EOL (go-gitea#19451)
  Add Changelog v1.16.6 (go-gitea#19339) (go-gitea#19450)
  Fix DELETE request for non-existent public key (go-gitea#19443)
  [skip ci] Updated translations via Crowdin
  Don't panic on `ErrEmailInvalid` (go-gitea#19441)
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
- Add a return for the first "block" of errors, which fixes the double
error messages.
- Add a return for `externallyManaged`.
- Resolves go-gitea#19398
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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. modifies/api This PR adds API routes or modifies them type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiple JSONs returned when doing DELETE on /v1/user/keys/2 with a non-existing key
4 participants