Skip to content

Conversation

@earl-warren
Copy link
Contributor

(cherry picked from commit 056a21c81b8f098032fc6cdfef2e7ad7b64e5e42)

- Update github.com/gliderlabs/ssh to include gliderlabs/ssh@02f9d57.
- Resolves https://codeberg.org/forgejo/forgejo/issues/1230

(cherry picked from commit 056a21c81b8f098032fc6cdfef2e7ad7b64e5e42)
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2023
@lunny lunny requested a review from wxiaoguang November 3, 2023 14:01
@lunny lunny added this to the 1.22.0 milestone Nov 3, 2023
@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 Nov 3, 2023
@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 Nov 3, 2023
@wxiaoguang wxiaoguang enabled auto-merge (squash) November 3, 2023 14:48
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 3, 2023
@GiteaBot
Copy link
Collaborator

GiteaBot commented Nov 3, 2023

earl-warren please fix the merge conflicts. 🍵

(unrelated comment)

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 3, 2023
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 3, 2023
@wxiaoguang wxiaoguang merged commit da0c4b8 into go-gitea:main Nov 3, 2023
@GiteaBot
Copy link
Collaborator

GiteaBot commented Nov 3, 2023

I was unable to create a backport for 1.20. @earl-warren, please send one manually. 🍵

go run ./contrib/backport 27893
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Nov 3, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 6, 2023
* upstream/main:
  Fix edit topic UI (go-gitea#27925)
  Unify two factor check (go-gitea#27915)
  Revert go-gitea#27870 (go-gitea#27917)
  Fix JS NPE when viewing specific range of PR commits (go-gitea#27912)
  Install poetry dependencies with --no-root (go-gitea#27919)
  Show correct commit sha when viewing single commit diff (go-gitea#27916)
  Fix 500 when deleting a dismissed review (go-gitea#27903)
  Remove action runners on user deletion (go-gitea#27902)
  Remove SSH workaround (go-gitea#27893)
  Remove "tabindex" from some form buttons (go-gitea#27892)
  Refactor the function RemoveOrgUser (go-gitea#27582)
  Fix DownloadFunc when migrating releases (go-gitea#27887)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
Revert the workaround of go-gitea#26409 and fix go-gitea#26411, update github.com/gliderlabs/ssh to include gliderlabs/ssh@02f9d57
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 1, 2024
@wxiaoguang wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.20 labels Feb 22, 2024
@6543
Copy link
Member

6543 commented Feb 22, 2024

-> #29332

@6543 6543 added backport/done All backports for this PR have been created backport/v1.21 labels Feb 22, 2024
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.

7 participants