Skip to content

Commit e1ec9b2

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Rewrite fuzzers to native Go harnesses (go-gitea#22313) Update Emoji dataset to Unicode 14 (go-gitea#22342) fix gravatar disable bug (go-gitea#22336)
2 parents d1c7b74 + 906d8cc commit e1ec9b2

File tree

6 files changed

+566
-357
lines changed

6 files changed

+566
-357
lines changed

assets/emoji.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/generate-emoji.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
const (
2727
gemojiURL = "https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json"
28-
maxUnicodeVersion = 12
28+
maxUnicodeVersion = 14
2929
)
3030

3131
var flagOut = flag.String("o", "modules/emoji/emoji_data.go", "out")

models/system/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func Init() error {
275275
}
276276
}
277277

278-
if enableFederatedAvatarSetting.GetValueBool() {
278+
if GravatarSourceURL != nil && enableFederatedAvatarSetting.GetValueBool() {
279279
LibravatarService = libravatar.New()
280280
if GravatarSourceURL.Scheme == "https" {
281281
LibravatarService.SetUseHTTPS(true)

0 commit comments

Comments
 (0)