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.

Sign up for GitHub

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

Jump to bottom

Upgrade x/net to 0.13.0 #26297

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Upgrade x/net to 0.13.0 #26297

merged 2 commits into from
Aug 3, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Aug 3, 2023

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 3, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 3, 2023
@lunny lunny added the backport/v1.20 This PR should be backported to Gitea 1.20 label Aug 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 Aug 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 Aug 3, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 3, 2023
@lunny lunny enabled auto-merge (squash) August 3, 2023 08:29
@lunny lunny merged commit cad2251 into go-gitea:main Aug 3, 2023
23 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Aug 3, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Aug 3, 2023

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

go run ./contrib/backport 26297
...  // 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 Aug 3, 2023
@lunny lunny deleted the lunny/upgrade_go_net branch August 3, 2023 08:33
@lunny lunny mentioned this pull request Aug 3, 2023
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Aug 3, 2023
lunny added a commit that referenced this pull request Aug 3, 2023
@lunny
Upgrade x/net to 0.13.0 (#26301)
8e07d53 
backport #26297
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 3, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
9c39987 
* upstream/main:
  Make confusable character warning less jarring (go-gitea#25069)
  Update Gmail example (go-gitea#26302)
  Fix the topic validation rule and suport dots (go-gitea#26286)
  Upgrade x/net to 0.13.0 (go-gitea#26297)
  add unit test for user renaming (go-gitea#26261)
  add some Wiki unit tests (go-gitea#26260)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@denyskon denyskon denyskon approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
4 participants
@lunny @GiteaBot @denyskon @delvh