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.

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

Update Chroma to v2.13.0 #29732

Merged
merged 3 commits into from
Mar 12, 2024
Merged

Update Chroma to v2.13.0 #29732

merged 3 commits into from
Mar 12, 2024

Conversation

JakobDev
Copy link
Contributor

This adds new lexers and includes some fixes. See https://github.com/alecthomas/chroma/releases/tag/v2.13.0 for the full changelog.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 12, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 12, 2024
@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 Mar 12, 2024
@techknowlogick
Copy link
Member

Thanks, @JakobDev. Could you run make tidy and push the changes?

@ maintainers: what do you think about backporting this? I don't see any breaking changes in the chroma changelog, and this could also be considered a bug fix.

Copy link
Member

@jolheiser jolheiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm pending tidy

@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 Mar 12, 2024
@techknowlogick techknowlogick added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 12, 2024
@techknowlogick
Copy link
Member

@jolheiser I've applied the backport label. As this changes go.mod I suspect our bot won't be able to apply it directly. @JakobDev, the bot will probably ping you once this is merged asking you to do a manual backport, but we can handle the backport (with attribution to you for the original PR ofc) to not add anything extra onto your plate.

@JakobDev
Copy link
Contributor Author

Could you run make tidy and push the changes?

Done

@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 12, 2024
@silverwind silverwind merged commit 3e7ae79 into go-gitea:main Mar 12, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 12, 2024
@GiteaBot
Copy link
Contributor

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

go run ./contrib/backport 29732
...  // 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 Mar 12, 2024
@silverwind
Copy link
Member

We don't usually backport stuff like this, but I guess if author is willing, they can do it.

zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 13, 2024
* giteaofficial/main:
  Fix date rendering by adding `<gitea-absolute-date>` (go-gitea#29725)
  Update to labeler v5 (go-gitea#29721)
  Update Chroma to v2.13.0 (go-gitea#29732)
  Highlight archived labels (go-gitea#29680)
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 13, 2024
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 13, 2024
* main:
  fix missed RenderLabel change in card template (go-gitea#29772)
  Fix incorrect locale Tr for gpg command (go-gitea#29754)
  Improve a11y document and dropdown item (go-gitea#29753)
  Improve QueryEscape helper function (go-gitea#29768)
  Use relative links for commits, mentions, and issues in markdown (go-gitea#29427)
  Move fork router functions to a standalone file (go-gitea#29756)
  Configure pinned JS dependencies via updates.config.js (go-gitea#29696)
  Refactor to use optional.Option for issue index search option (go-gitea#29739)
  Fix user router possbile panic (go-gitea#29751)
  Refactor label.IsArchived() (go-gitea#29750)
  Fix date rendering by adding `<gitea-absolute-date>` (go-gitea#29725)
  Update to labeler v5 (go-gitea#29721)
  Update Chroma to v2.13.0 (go-gitea#29732)
lunny pushed a commit to lunny/gitea that referenced this pull request Mar 15, 2024
This adds new lexers and includes some fixes. See
https://github.com/alecthomas/chroma/releases/tag/v2.13.0 for the full
changelog.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
@lunny lunny added the backport/done All backports for this PR have been created label Mar 15, 2024
lunny added a commit that referenced this pull request Mar 15, 2024
Backport #29732 

This adds new lexers and includes some fixes. See
https://github.com/alecthomas/chroma/releases/tag/v2.13.0 for the full
changelog.

Co-authored-by: JakobDev <jakobdev@gmx.de>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 11, 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 backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants