mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-20 00:19:00 +00:00
bircniandsilverwind
ba4f8fa246
Adds a repository setting for the default squash merge commit message body with GitHub's options `PR_BODY`, `COMMIT_MESSAGES` and `BLANK`, also settable via `squash_merge_commit_message` in the API. The commit title stays the pull request title. 1. Breaking: API squash merges without `merge_message_field` now get the same default message as the web merge box instead of a title-only commit, which affects clients sending only `Do` like Renovate. An empty value keeps title-only. 2. Breaking: `[repository.pull-request] DEFAULT_SQUASH_MERGE_MESSAGE` replaces `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`, which still works as a deprecated fallback. Repositories store the default when created or next saved. 3. Deprecated app.ini keys now migrate through one table instead of per-loader fallbacks, which also fixes the ignored `[mailer] CERT_FILE` and `KEY_FILE` fallbacks. Deprecation warnings no longer claim a removal version. <img width="1891" height="571" alt="grafik" src="https://github.com/user-attachments/assets/0fdcde13-1f11-4156-b598-d80eb0d04cbe" /> --------- Co-authored-by: silverwind <me@silverwind.io>
88 lines
2.6 KiB
Go
88 lines
2.6 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"gitea.dev/modules/generate"
|
|
)
|
|
|
|
// LFS represents the server-side configuration for Git LFS.
|
|
// Ideally these options should be in a section like "[lfs_server]",
|
|
// but they are in "[server]" section due to historical reasons.
|
|
// Could be refactored in the future while keeping backwards compatibility.
|
|
var LFS = struct {
|
|
StartServer bool `ini:"LFS_START_SERVER"`
|
|
AllowPureSSH bool `ini:"LFS_ALLOW_PURE_SSH"`
|
|
JWTSecretBytes []byte `ini:"-"`
|
|
HTTPAuthExpiry time.Duration `ini:"LFS_HTTP_AUTH_EXPIRY"`
|
|
MaxFileSize int64 `ini:"LFS_MAX_FILE_SIZE"`
|
|
LocksPagingNum int `ini:"LFS_LOCKS_PAGING_NUM"`
|
|
MaxBatchSize int `ini:"LFS_MAX_BATCH_SIZE"`
|
|
|
|
Storage *Storage
|
|
}{}
|
|
|
|
// LFSClient represents configuration for Gitea's LFS clients, for example: mirroring upstream Git LFS
|
|
var LFSClient = struct {
|
|
BatchSize int `ini:"BATCH_SIZE"`
|
|
BatchOperationConcurrency int `ini:"BATCH_OPERATION_CONCURRENCY"`
|
|
}{}
|
|
|
|
func loadLFSFrom(rootCfg ConfigProvider) error {
|
|
mustMapSetting(rootCfg, "lfs_client", &LFSClient)
|
|
|
|
mustMapSetting(rootCfg, "server", &LFS)
|
|
sec := rootCfg.Section("server")
|
|
|
|
lfsSec, _ := rootCfg.GetSection("lfs")
|
|
|
|
var err error
|
|
LFS.Storage, err = getStorage(rootCfg, "lfs", "", lfsSec)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Rest of LFS service settings
|
|
if LFS.LocksPagingNum == 0 {
|
|
LFS.LocksPagingNum = 50
|
|
}
|
|
|
|
if LFSClient.BatchSize < 1 {
|
|
LFSClient.BatchSize = 20
|
|
}
|
|
|
|
if LFSClient.BatchOperationConcurrency < 1 {
|
|
// match the default git-lfs's `lfs.concurrenttransfers` https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-config.adoc#upload-and-download-transfer-settings
|
|
LFSClient.BatchOperationConcurrency = 8
|
|
}
|
|
|
|
LFS.HTTPAuthExpiry = sec.Key("LFS_HTTP_AUTH_EXPIRY").MustDuration(24 * time.Hour)
|
|
|
|
if !LFS.StartServer || !InstallLock {
|
|
return nil
|
|
}
|
|
|
|
jwtSecretBase64 := loadSecret(rootCfg.Section("server"), "LFS_JWT_SECRET_URI", "LFS_JWT_SECRET")
|
|
LFS.JWTSecretBytes, err = generate.DecodeJwtSecretBase64(jwtSecretBase64)
|
|
if err != nil {
|
|
LFS.JWTSecretBytes, jwtSecretBase64 = generate.NewJwtSecretWithBase64()
|
|
|
|
// Save secret
|
|
saveCfg, err := rootCfg.PrepareSaving()
|
|
if err != nil {
|
|
return fmt.Errorf("error saving JWT Secret for custom config: %v", err)
|
|
}
|
|
rootCfg.Section("server").Key("LFS_JWT_SECRET").SetValue(jwtSecretBase64)
|
|
saveCfg.Section("server").Key("LFS_JWT_SECRET").SetValue(jwtSecretBase64)
|
|
if err := saveCfg.Save(); err != nil {
|
|
return fmt.Errorf("error saving JWT Secret for custom config: %v", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|