Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-08 14:12:37 +02:00
Code Issues Activity

Fix default merge style (#20564)

Browse Source
This commit is contained in:
wxiaoguang authored and GitHub committed 2022-07-31 17:13:31 +02:00
1 parent 66b623c2aa
commit 2c2f75cb2c
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/repo/issue/view_content/pull.tmpl
+1
View File
@@ -357,6 +357,7 @@
'emptyCommit': {{.Issue.PullRequest.IsEmpty}},
'pullHeadCommitID': {{.PullHeadCommitID}},
'isPullBranchDeletable': {{.IsPullBranchDeletable}},
'defaultMergeStyle': {{.MergeStyle}},
'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
'mergeMessageFieldPlaceHolder': {{$.locale.Tr "repo.editor.commit_message_desc"}},