gmoker/gitea
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: DEFAULT_MERGE_STYLE fast-forward-only
Some checks failed
/ deploy (push) Failing after 0s
Details

Browse Source
This commit is contained in:
ange 2024-05-15 18:52:35 +02:00
parent 357cada1dd
commit 41d089f0dc
Signed by: ange
GPG Key ID: 9E0C4157BB7BEB1D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.ini
View File

@ -1041,7 +1041,7 @@ ENABLED = false
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;[repository.pull-request] [repository.pull-request]
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
@ -1055,7 +1055,7 @@ ENABLED = false
;REOPEN_KEYWORDS = reopen,reopens,reopened ;REOPEN_KEYWORDS = reopen,reopens,reopened
;; ;;
;; Set default merge style for repository creating, valid options: merge, rebase, rebase-merge, squash, fast-forward-only ;; Set default merge style for repository creating, valid options: merge, rebase, rebase-merge, squash, fast-forward-only
;DEFAULT_MERGE_STYLE = merge DEFAULT_MERGE_STYLE = fast-forward-only
;; ;;
;; In the default merge message for squash commits include at most this many commits ;; In the default merge message for squash commits include at most this many commits
;DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT = 50 ;DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT = 50