sim1222-mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-19 07:04:10 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/bots

Browse Source
This commit is contained in:
Jason Song
2022-12-08 18:11:18 +08:00
committed by GitHub
parent 49143952fa 0585ac3ac6
commit 266a122ba2
50 changed files with 135 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/setting/database.go
View File

@ -49,6 +49,7 @@ var (
MaxOpenConns int
ConnMaxLifetime time.Duration
IterateBufferSize int
AutoMigration bool
}{
Timeout: 500,
IterateBufferSize: 50,
@ -105,6 +106,7 @@ func InitDBConfig() {
Database.LogSQL = sec.Key("LOG_SQL").MustBool(true)
Database.DBConnectRetries = sec.Key("DB_RETRIES").MustInt(10)
Database.DBConnectBackoff = sec.Key("DB_RETRY_BACKOFF").MustDuration(3 * time.Second)
Database.AutoMigration = sec.Key("AUTO_MIGRATION").MustBool(true)
}
// DBConnStr returns database connection string

2
modules/setting/setting.go
View File

@ -945,7 +945,7 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
if SecretKey == "" {
// FIXME: https://github.com/go-gitea/gitea/issues/16832
// Until it supports rotating an existing secret key, we shouldn't move users off of the widely used default value
SecretKey = "!#@FDEWREWR&*(" // nolint:gosec
SecretKey = "!#@FDEWREWR&*(" //nolint:gosec
}
CookieRememberName = sec.Key("COOKIE_REMEMBER_NAME").MustString("gitea_incredible")