diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-07-31 23:13:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 17:13:31 +0200 |
| commit | 2c2f75cb2cf0de6fdeeb931377873dd07ffbe774 (patch) | |
| tree | 11b92d9b0d76f688dc799f534203dfc435cdda7c /templates/repo/issue/view_content | |
| parent | 66b623c2aa6b6e6b6d93e20c8ce3d4588a4ec101 (diff) | |
| download | gitea-2c2f75cb2cf0de6fdeeb931377873dd07ffbe774.tar.gz gitea-2c2f75cb2cf0de6fdeeb931377873dd07ffbe774.zip | |
Fix default merge style (#20564)
Diffstat (limited to 'templates/repo/issue/view_content')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index be2c8f0c0e..59e0962d17 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -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"}}, |