tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-16 22:48:27 +00:00
Code Releases Activity

Fix default merge style for pull requests (#20564) (#20565)

Browse Source
This commit is contained in:
wxiaoguang
2022-07-31 22:41:06 +08:00
committed by GitHub
parent 8769df117d
commit 51c8c0f3fe
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/repo/issue/view_content/pull.tmpl
View File

@@ -358,6 +358,7 @@
'emptyCommit': {{.Issue.PullRequest.IsEmpty}},
'pullHeadCommitID': {{.PullHeadCommitID}},
'isPullBranchDeletable': {{.IsPullBranchDeletable}},
'defaultMergeStyle': {{.MergeStyle}},
'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
'mergeMessageFieldPlaceHolder': {{$.i18n.Tr "repo.editor.commit_message_desc"}},