mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-20 08:20:04 +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>
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"time"
|
|
|
|
"gitea.dev/modules/log"
|
|
)
|
|
|
|
// Mirror settings
|
|
var Mirror = struct {
|
|
Enabled bool
|
|
DisableNewPull bool
|
|
DisableNewPush bool
|
|
DefaultInterval time.Duration
|
|
MinInterval time.Duration
|
|
}{
|
|
Enabled: true,
|
|
DisableNewPull: false,
|
|
DisableNewPush: false,
|
|
MinInterval: 10 * time.Minute,
|
|
DefaultInterval: 8 * time.Hour,
|
|
}
|
|
|
|
func loadMirrorFrom(rootCfg ConfigProvider) {
|
|
if err := rootCfg.Section("mirror").MapTo(&Mirror); err != nil {
|
|
log.Fatal("Failed to map Mirror settings: %v", err)
|
|
}
|
|
|
|
if !Mirror.Enabled {
|
|
Mirror.DisableNewPull = true
|
|
Mirror.DisableNewPush = true
|
|
}
|
|
|
|
if Mirror.MinInterval.Minutes() < 1 {
|
|
log.Warn("Mirror.MinInterval is too low, set to 1 minute")
|
|
Mirror.MinInterval = 1 * time.Minute
|
|
}
|
|
if Mirror.DefaultInterval < Mirror.MinInterval {
|
|
Mirror.DefaultInterval = max(time.Hour*8, Mirror.MinInterval)
|
|
log.Warn("Mirror.DefaultInterval is less than Mirror.MinInterval, set to %s", Mirror.DefaultInterval.String())
|
|
}
|
|
}
|