peezy-tech/jojo
2
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2026-05-12 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: remove #11024 workarounds (#12301)

Browse source 
remove two workarounds which are not required any more

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12301
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
Nils Goroll 2026-05-01 22:10:10 +02:00 • committed by Gusted
parent d867b25e72
commit 9d323c5125
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/setting/lfs.go
View file

@ -77,8 +77,6 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
return nil return nil
} }
// TODO: #11024 check nil because settings loaded twice
if LFS.SigningKey == nil {
keyCfg, err := loadKeyCfg(rootCfg, "server", "LFS_JWT_", "HS256", "lfs/private.pem") keyCfg, err := loadKeyCfg(rootCfg, "server", "LFS_JWT_", "HS256", "lfs/private.pem")
if err == nil { if err == nil {
LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing) LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing)
@ -86,7 +84,6 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
if err != nil { if err != nil {
return fmt.Errorf("lfs key initialization failed: %v", err) return fmt.Errorf("lfs key initialization failed: %v", err)
} }
}
return nil return nil
} }

2
services/lfs/server_test.go
View file

@ -105,8 +105,6 @@ var cfgVariants = []namedCfg{
} }
func TestAuthenticate(t *testing.T) { func TestAuthenticate(t *testing.T) {
// TODO: #11024
setting.InstallLock = true
for _, v := range cfgVariants { for _, v := range cfgVariants {
cfg := iniCommon + v.cfg cfg := iniCommon + v.cfg
t.Run(v.name, func(t *testing.T) { testAuthenticate(t, cfg) }) t.Run(v.name, func(t *testing.T) { testAuthenticate(t, cfg) })