diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-06-18 03:20:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 21:20:07 -0400 |
| commit | 6c81b738f71e46aae33424051ac3e4cffa974fed (patch) | |
| tree | b21bcd0451da74d48970d2096701f59d4e02dbee /templates/repo/issue/view_content/pull.tmpl | |
| parent | 6c38f371ea3ed98a2ed0534261f5d175c11c628d (diff) | |
| download | gitea-6c81b738f71e46aae33424051ac3e4cffa974fed.tar.gz gitea-6c81b738f71e46aae33424051ac3e4cffa974fed.zip | |
Update Fomantic-UI to 2.8.6 and remove old workarounds (#11933)
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'templates/repo/issue/view_content/pull.tmpl')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index aacbb0c395..dc897bd7b9 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -194,7 +194,7 @@ </div> {{end}} {{end}} - + {{$canAutoMerge = true}} {{if (gt .Issue.PullRequest.CommitsBehind 0)}} <div class="ui divider"></div> @@ -312,7 +312,7 @@ </button> <div class="ui dropdown icon button"> <i class="dropdown icon"></i> - <div class="menu left"> + <div class="menu"> {{if $prUnit.PullRequestsConfig.AllowMerge}} <div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div> {{end}} |