Skip to content

Commit ca361e9

Browse files
committed
Update
1 parent dbc4403 commit ca361e9

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

models/migrations/v1_24/v315.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ func (s *Setting) TableName() string {
3030
}
3131

3232
func MigrateIniToDatabase(x *xorm.Engine) error {
33-
uiMap, err := util.ConfigSectionToMap(setting.UI, "ui", []string{"Reactions", "CustomEmojis"}...)
33+
uiMap, err := util.ConfigSectionToMap(
34+
setting.UI, "ui",
35+
[]string{
36+
"Reactions", "CustomEmojis", "MaxDisplayFileSize", "DefaultTheme", "Themes",
37+
"FileIconTheme", "PreferredTimestampTense", "AmbiguousUnicodeDetection"}...,
38+
)
3439
if err != nil {
3540
return err
3641
}

models/migrations/v1_24/v315_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ func Test_MigrateIniToDatabase(t *testing.T) {
2323

2424
cnt, err := x.Table("system_setting").Where("setting_key LIKE 'ui.%'").Count()
2525
assert.NoError(t, err)
26-
assert.EqualValues(t, 21, cnt)
26+
assert.EqualValues(t, 16, cnt)
2727
}

models/user/user.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"context"
99
"encoding/hex"
1010
"fmt"
11-
_ "image/jpeg" // Needed for jpeg support
1211
"mime"
1312
"net/mail"
1413
"net/url"
@@ -19,6 +18,8 @@ import (
1918
"time"
2019
"unicode"
2120

21+
_ "image/jpeg" // Needed for jpeg support
22+
2223
"code.gitea.io/gitea/models/auth"
2324
"code.gitea.io/gitea/models/db"
2425
"code.gitea.io/gitea/modules/auth/openid"

0 commit comments

Comments
 (0)