Skip to content

WIP: Fix incorrect init order #31031

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

Closed
wxiaoguang wants to merge 1 commit into from
Closed

WIP: Fix incorrect init order #31031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/base/tool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ func TestBasicAuthDecode(t *testing.T) {
func TestVerifyTimeLimitCode(t *testing.T) {
defer test.MockVariableValue(&setting.InstallLock, true)()
initGeneralSecret := func(secret string) {
setting.InstallLock = true
setting.CfgProvider, _ = setting.NewConfigProviderFromData(fmt.Sprintf(`
[security]
INSTALL_LOCK=true
[oauth2]
JWT_SECRET = %s
`, secret))
Expand Down
2 changes: 1 addition & 1 deletion modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ func loadCommonSettingsFrom(cfg ConfigProvider) error {

mustCurrentRunUserMatch(cfg) // it depends on the SSH config, only non-builtin SSH server requires this check

loadOAuth2From(cfg)
loadSecurityFrom(cfg)
loadOAuth2From(cfg)
if err := loadAttachmentFrom(cfg); err != nil {
return err
}
Expand Down