mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09: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>
55 lines
2.0 KiB
Go
55 lines
2.0 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import "strings"
|
|
|
|
// Migrations settings
|
|
var Migrations = struct {
|
|
MaxAttempts int
|
|
RetryBackoff int
|
|
EgressMode string
|
|
AllowedHostList string
|
|
BlockedHostList string
|
|
SkipTLSVerify bool
|
|
}{
|
|
MaxAttempts: 3,
|
|
RetryBackoff: 3,
|
|
EgressMode: "lax",
|
|
}
|
|
|
|
func loadMigrationsFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("migrations")
|
|
Migrations.MaxAttempts = sec.Key("MAX_ATTEMPTS").MustInt(Migrations.MaxAttempts)
|
|
Migrations.RetryBackoff = sec.Key("RETRY_BACKOFF").MustInt(Migrations.RetryBackoff)
|
|
|
|
egressModeSet := sec.HasKey("EGRESS_MODE")
|
|
Migrations.EgressMode = normalizePolicyMode(sec.Key("EGRESS_MODE").String())
|
|
|
|
deprecatedSetting(rootCfg, "migrations", "ALLOWED_DOMAINS", "migrations", "ALLOWED_HOST_LIST")
|
|
deprecatedSetting(rootCfg, "migrations", "BLOCKED_DOMAINS", "migrations", "BLOCKED_HOST_LIST")
|
|
deprecatedSetting(rootCfg, "migrations", "ALLOW_LOCALNETWORKS", "migrations", "ALLOWED_HOST_LIST")
|
|
Migrations.AllowedHostList = ConfigSectionKeyString(sec, "ALLOWED_HOST_LIST")
|
|
if Migrations.AllowedHostList == "" {
|
|
var hosts []string
|
|
for host := range strings.SplitSeq(ConfigSectionKeyString(sec, "ALLOWED_DOMAINS"), ",") {
|
|
if host = strings.TrimSpace(host); host != "" {
|
|
hosts = append(hosts, host+":*")
|
|
}
|
|
}
|
|
if len(hosts) > 0 && !egressModeSet {
|
|
Migrations.EgressMode = "strict" // ALLOWED_DOMAINS allowed only its hosts, on any port
|
|
}
|
|
if ConfigSectionKeyBool(sec, "ALLOW_LOCALNETWORKS") {
|
|
hosts = append(hosts, "private:*", "loopback:*")
|
|
}
|
|
Migrations.AllowedHostList = strings.Join(hosts, ",")
|
|
}
|
|
Migrations.BlockedHostList = ConfigSectionKeyString(sec, "BLOCKED_HOST_LIST", ConfigSectionKeyString(sec, "BLOCKED_DOMAINS"))
|
|
checkHostList("[migrations] ALLOWED_HOST_LIST", Migrations.AllowedHostList, false)
|
|
checkHostList("[migrations] BLOCKED_HOST_LIST", Migrations.BlockedHostList, true)
|
|
|
|
Migrations.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool(false)
|
|
}
|