Skip to content

Avoid emoji mismatch and allow to only enable chosen emojis #35692

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
Merged
merged 2 commits into from
Oct 19, 2025
Merged

Avoid emoji mismatch and allow to only enable chosen emojis #35692

merged 2 commits into from
Oct 19, 2025
+113 −90

Conversation

wxiaoguang
Copy link
Contributor

Fix #23635

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 18, 2025
@wxiaoguang wxiaoguang mentioned this pull request Oct 18, 2025
Closed
@wxiaoguang
Copy link
Contributor Author

image

@wxiaoguang wxiaoguang added the type/enhancement An improvement of existing functionality label Oct 18, 2025
@wxiaoguang wxiaoguang added this to the 1.26.0 milestone Oct 18, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code docs-update-needed The document needs to be updated synchronously labels Oct 18, 2025
@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 Oct 18, 2025
@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 Oct 19, 2025
@lunny lunny merged commit 66ee8f3 into go-gitea:main Oct 19, 2025
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 19, 2025
@wxiaoguang @GiteaBot
Avoid emoji mismatch and allow to only enable chosen emojis (go-gitea…
6094c3b 
…#35692)

Fix go-gitea#23635
@GiteaBot GiteaBot mentioned this pull request Oct 19, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Oct 19, 2025
@wxiaoguang wxiaoguang deleted the fix-emoji branch October 20, 2025 00:26
wxiaoguang added a commit that referenced this pull request Oct 20, 2025
@GiteaBot @wxiaoguang
Avoid emoji mismatch and allow to only enable chosen emojis (#35692) (#…
6df51d4 
…35705)

Backport #35692 by wxiaoguang

Fix #23635

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 20, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
f9d9470 
* giteaofficial/main:
  Avoid emoji mismatch and allow to only enable chosen emojis (go-gitea#35692)
  feat(diff): Enable commenting on expanded lines in PR diffs (go-gitea#35662)
  Fix various bugs (go-gitea#35684)
  Fix workflow run event status while rerunning a failed job (go-gitea#35689)
  Use gitrepo.Repository instead of wikipath (go-gitea#35398)
  [skip ci] Updated translations via Crowdin
  Bump `actions/labeler` to v6 (go-gitea#35681)
  Use LFS object size instead of blob size when viewing a LFS file (go-gitea#35679)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunny lunny lunny approved these changes

+1 more reviewer

@Zettat123 Zettat123 Zettat123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/v1.25 docs-update-needed The document needs to be updated synchronously lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/enhancement An improvement of existing functionality

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

option to disable emoji replacements

4 participants

@wxiaoguang @lunny @Zettat123 @GiteaBot