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

Refactor HTMLFormat, update chroma render, fix js error #33136

Merged
merged 7 commits into from
Jan 8, 2025
Merged

Refactor HTMLFormat, update chroma render, fix js error #33136

merged 7 commits into from
Jan 8, 2025

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jan 7, 2025 •
edited
Loading

A small refactor to improve HTMLFormat, to help to prevent low-level mistakes.

And fix #33141, fix #33139

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 7, 2025
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 7, 2025
@wxiaoguang wxiaoguang added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 7, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jan 7, 2025
@wxiaoguang wxiaoguang added type/refactoring Existing code has been cleaned up. There should be no new functionality. and removed modifies/go Pull requests that update Go code labels Jan 7, 2025
@wxiaoguang wxiaoguang added this to the 1.24.0 milestone Jan 7, 2025
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 7, 2025
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 8, 2025
@wxiaoguang wxiaoguang changed the title Make HTMLFormat stricter Refactor HTMLFormat and update chroma render Jan 8, 2025
@wxiaoguang wxiaoguang changed the title Refactor HTMLFormat and update chroma render Refactor HTMLFormat, update chroma render, fix js error Jan 8, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 8, 2025
Closed
@wxiaoguang wxiaoguang force-pushed the refactor-html-format branch from 1acc140 to ba122c9 Compare January 8, 2025 00:51
@wxiaoguang wxiaoguang force-pushed the refactor-html-format branch from ba122c9 to e6dbf98 Compare January 8, 2025 00:52
@wxiaoguang wxiaoguang mentioned this pull request Jan 8, 2025
Closed
@wxiaoguang wxiaoguang force-pushed the refactor-html-format branch from a1693bf to bed0c19 Compare January 8, 2025 01:51
@wxiaoguang wxiaoguang mentioned this pull request Jan 8, 2025
Merged
@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 Jan 8, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 8, 2025
@lunny lunny enabled auto-merge (squash) January 8, 2025 03:39
@lunny lunny merged commit 386c1ed into go-gitea:main Jan 8, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 8, 2025
lunny pushed a commit that referenced this pull request Jan 8, 2025
@wxiaoguang @yp05327
Fix git remote error check, fix dependencies, fix js error (#33129) (…
531f36e 
…#33133)

And update some dependencies to fix bugs.

Backport  #33129, #33136

Fix #32889
Fix #33141
Fix #33139

---------

Co-authored-by: yp05327 <[email protected]>
@wxiaoguang wxiaoguang deleted the refactor-html-format branch January 8, 2025 06:38
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 10, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9e7866c 
* giteaofficial/main:
  Fix raw file API ref handling (go-gitea#33172)
  [skip ci] Updated translations via Crowdin
  Fix ACME panic (go-gitea#33178)
  Automerge supports deleting branch automatically after merging (go-gitea#32343)
  Fix branch dropdown not display ref name (go-gitea#33159)
  Add .run to gitignore (go-gitea#33175)
  Fix assignee list overlapping in Issue sidebar (go-gitea#33176)
  Fix pam auth test regression (go-gitea#33169)
  Move repo size to sidebar (go-gitea#33155)
  Fix fuzz test (go-gitea#33156)
  Refactor older tests to use testify (go-gitea#33140)
  [skip ci] Updated translations via Crowdin
  Fix typo in gitea downloader test and add missing codebase in `ToGitServiceType` (go-gitea#33146)
  Fix form width (go-gitea#33151)
  Convert github.com/xanzy/go-gitlab into gitlab.com/gitlab-org/api/client-go (go-gitea#33126)
  Refactor HTMLFormat, update chroma render, fix js error (go-gitea#33136)
  Add missed transaction on setmerged (go-gitea#33079)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zettat123 Zettat123 Zettat123 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/frontend modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Funky spaces in yaml syntax highlighting JS promise rejection when adding a '#' to a project's description
4 participants
@wxiaoguang @lunny @Zettat123 @GiteaBot