From 9d323c51252f6cb41a39f2ad56a8c728941936e0 Mon Sep 17 00:00:00 2001 From: Nils Goroll Date: Fri, 1 May 2026 22:10:10 +0200 Subject: [PATCH] chore: remove #11024 workarounds (#12301) remove two workarounds which are not required any more Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12301 Reviewed-by: Gusted --- modules/setting/lfs.go | 15 ++++++--------- services/lfs/server_test.go | 2 -- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go index 12f90cd092..a97ed8d40f 100644 --- a/modules/setting/lfs.go +++ b/modules/setting/lfs.go @@ -77,15 +77,12 @@ func loadLFSFrom(rootCfg ConfigProvider) error { 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") - if err == nil { - LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing) - } - if err != nil { - return fmt.Errorf("lfs key initialization failed: %v", err) - } + keyCfg, err := loadKeyCfg(rootCfg, "server", "LFS_JWT_", "HS256", "lfs/private.pem") + if err == nil { + LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing) + } + if err != nil { + return fmt.Errorf("lfs key initialization failed: %v", err) } return nil diff --git a/services/lfs/server_test.go b/services/lfs/server_test.go index 67c93f30bb..065387ce08 100644 --- a/services/lfs/server_test.go +++ b/services/lfs/server_test.go @@ -105,8 +105,6 @@ var cfgVariants = []namedCfg{ } func TestAuthenticate(t *testing.T) { - // TODO: #11024 - setting.InstallLock = true for _, v := range cfgVariants { cfg := iniCommon + v.cfg t.Run(v.name, func(t *testing.T) { testAuthenticate(t, cfg) })