From 9f43fc9d9aa8ee99b2ad1a86e76423796ffda198 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 5 May 2022 16:33:37 +0200
Subject: [PATCH] remove webUI part for another pull

---
 templates/repo/issue/view_content/pull.tmpl | 406 ++------------------
 web_src/js/features/repo-issue.js           |  24 +-
 2 files changed, 35 insertions(+), 395 deletions(-)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index f2a3192e5bce..8c43ace32e13 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -321,25 +321,8 @@
 					{{if .AllowMerge}}
 						{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
 						{{$approvers := .Issue.PullRequest.GetApprovers}}
-						{{/* We build a custom variable here to not clutter the template with checks if .LatestCommitStatus exists. */}}
-						{{$statusChecksPending := true}}
-						{{if .LatestCommitStatus}}
-							{{$statusChecksPending = not (eq .LatestCommitStatus.State "success")}}
-						{{end}}
-
 						{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
 							<div class="ui divider"></div>
-							{{ $mergeButtonColor := "green"}}
-							{{if $statusChecksPending}}
-								{{ $mergeButtonColor = "blue"}}
-							{{end}}
-							{{ if .HasPendingPullRequestMerge }}
-								{{ $mergeButtonColor = "red"}}
-								{{ $createdPRMergeStr:= TimeSinceUnix .PendingPullRequestMerge.CreatedUnix $.i18n.Lang }}
-								<div class="ui info message">
-									{{$.i18n.Tr "repo.pulls.pr_has_pending_merge_on_success" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr | Safe }}
-								</div>
-							{{end}}
 							{{if $prUnit.PullRequestsConfig.AllowMerge}}
 							<div class="ui form merge-fields" style="display: none">
 								<form action="{{.Link}}/merge" method="post">
@@ -444,13 +427,10 @@
 										{{.CsrfTokenHtml}}
 										<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
 										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage $.Context}}">
+											<input type="text" name="merge_commit_id"  placeholder="{{$.i18n.Tr "repo.pulls.merge_commit_id"}}">
 										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui red button" type="submit" name="do" value="merge">
-											{{$.i18n.Tr "repo.pulls.merge_pull_request_now"}}
+										<button class="ui red button" type="submit" name="do" value="manually-merged">
+											{{$.i18n.Tr "repo.pulls.merge_manually"}}
 										</button>
 										<button class="ui button merge-cancel">
 											{{$.i18n.Tr "cancel"}}
@@ -463,379 +443,53 @@
 										{{end}}
 									</form>
 								</div>
-								<div class="ui form merge-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-											<input type="hidden" name="merge_when_checks_succeed" value="1"/>
-										{{end}}
-										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage $.Context}}">
-										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui {{$mergeButtonColor}} button" type="submit" name="do" value="merge">
-											{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request_on_status_success"}}
-											{{else if .HasPendingPullRequestMerge}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request_now"}}
-											{{else}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
-											{{end}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
-										{{end}}
-									</form>
-								</div>
-							{{end}}
-							{{if $prUnit.PullRequestsConfig.AllowRebase}}
-								<div class="ui form rebase-now-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										<button class="ui red button" type="submit" name="do" value="rebase">
-											{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
-										{{end}}
-									</form>
-								</div>
-								<div class="ui form rebase-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-											<input type="hidden" name="merge_when_checks_succeed" value="1"/>
-										{{end}}
-										<button class="ui {{$mergeButtonColor}} button" type="submit" name="do" value="rebase">
-											{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_on_status_success"}}
-											{{else if .HasPendingPullRequestMerge}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}
-											{{else}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
-											{{end}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-									</form>
-								</div>
 							{{end}}
-							{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
-								<div class="ui form rebase-merge-now-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage $.Context}}">
-										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui red button" type="submit" name="do" value="rebase-merge">
-											{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
-										{{end}}
-									</form>
-								</div>
-								<div class="ui form rebase-merge-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-											<input type="hidden" name="merge_when_checks_succeed" value="1"/>
+							<div class="dib">
+								<div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button">
+									<button class="ui button" data-do="{{.MergeStyle}}">
+										{{svg "octicon-git-merge"}}
+										<span class="button-text">
+										{{if eq .MergeStyle "merge"}}
+											{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
 										{{end}}
-										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage $.Context}}">
-										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui {{$mergeButtonColor}} button" type="submit" name="do" value="rebase-merge">
-											{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_on_status_success"}}
-											{{else if .HasPendingPullRequestMerge}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}
-											{{else}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
-											{{end}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
+										{{if eq .MergeStyle "rebase"}}
+											{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
 										{{end}}
-									</form>
-								</div>
-							{{end}}
-							{{if $prUnit.PullRequestsConfig.AllowSquash}}
-								<div class="ui form squash-now-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage $.Context}}">
-										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{.GetCommitMessages}}Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui red button" type="submit" name="do" value="squash">
-											{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
+										{{if eq .MergeStyle "rebase-merge"}}
+											{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
 										{{end}}
-									</form>
-								</div>
-								<div class="ui form squash-fields" style="display: none">
-									<form action="{{.Link}}/merge" method="post">
-										{{.CsrfTokenHtml}}
-										{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-											<input type="hidden" name="merge_when_checks_succeed" value="1"/>
+										{{if eq .MergeStyle "squash"}}
+											{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
 										{{end}}
-										<div class="field">
-											<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage $.Context}}">
-										</div>
-										<div class="field">
-											<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{.GetCommitMessages}}Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
-										</div>
-										<button class="ui {{$mergeButtonColor}} button" type="submit" name="do" value="squash">
-											{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_on_status_success"}}
-											{{else if .HasPendingPullRequestMerge}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}
-											{{else}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
-											{{end}}
-										</button>
-										<button class="ui button merge-cancel">
-											{{$.i18n.Tr "cancel"}}
-										</button>
-										{{if .IsPullBranchDeletable}}
-											<div class="ui checkbox ml-2">
-												<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-												<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-											</div>
+										{{if eq .MergeStyle "manually-merged"}}
+											{{$.i18n.Tr "repo.pulls.merge_manually"}}
 										{{end}}
-									</form>
-								</div>
-							{{end}}
-
-							{{if and $statusChecksPending (not .HasPendingPullRequestMerge)}}
-								<div class="ui blue buttons merge-button">
-									<button class="ui button" data-do="{{.MergeStyle}}">
-										{{svg "octicon-git-merge"}}
-										<span class="button-text">
-											{{if eq .MergeStyle "merge"}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request_on_status_success"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_on_status_success"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase-merge"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_on_status_success"}}
-											{{end}}
-											{{if eq .MergeStyle "squash"}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_on_status_success"}}
-											{{end}}
-										</span>
-									</button>
-									<div class="ui dropdown icon button">
-										<i class="dropdown icon"></i>
-										<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_on_status_success"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowRebase}}
-												<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_on_status_success"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
-												<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_on_status_success"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowSquash}}
-												<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_on_status_success"}}</div>
-											{{end}}
-										</div>
-									</div>
-								</div>
-								<div class="ui red buttons merge-now-button">
-									<button class="ui button" data-do="{{.MergeStyle}}-now">
-										{{svg "octicon-git-merge"}}
-										<span class="button-text">
-											{{if eq .MergeStyle "merge"}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request_now"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase-merge"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}
-											{{end}}
-											{{if eq .MergeStyle "squash"}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}
-											{{end}}
 										</span>
 									</button>
-									<div class="ui dropdown icon button">
-										<i class="dropdown icon"></i>
-										<div class="menu">
-											{{if $prUnit.PullRequestsConfig.AllowMerge}}
-												<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge-now">{{$.i18n.Tr "repo.pulls.merge_pull_request_now"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowRebase}}
-												<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase-now">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
-												<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge-now">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}</div>
-											{{end}}
-											{{if $prUnit.PullRequestsConfig.AllowSquash}}
-												<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash-now">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}</div>
-											{{end}}
-										</div>
-									</div>
-								</div>
-							{{else if .HasPendingPullRequestMerge}}
-								<div class="merge-buttons-grid">
-									<div class="ui red buttons merge-button">
-										<button class="ui button" data-do="{{.MergeStyle}}">
-											{{svg "octicon-git-merge"}}
-											<span class="button-text">
-												{{if eq .MergeStyle "merge"}}
-													{{$.i18n.Tr "repo.pulls.merge_pull_request_now"}}
-												{{end}}
-												{{if eq .MergeStyle "rebase"}}
-													{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}
-												{{end}}
-												{{if eq .MergeStyle "rebase-merge"}}
-													{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}
-												{{end}}
-												{{if eq .MergeStyle "squash"}}
-													{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}
-												{{end}}
-												</span>
-										</button>
-										<div class="ui dropdown icon button">
-											<i class="dropdown icon"></i>
+									{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
+										<div class="ui dropdown icon button no-text">
+											{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 											<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_now"}}</div>
+												<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
 												{{end}}
 												{{if $prUnit.PullRequestsConfig.AllowRebase}}
-												<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request_now"}}</div>
+												<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
 												{{end}}
 												{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
-												<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request_now"}}</div>
+												<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
 												{{end}}
 												{{if $prUnit.PullRequestsConfig.AllowSquash}}
-												<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request_now"}}</div>
+												<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
+												{{end}}
+												{{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
+												<div class="item{{if eq .MergeStyle "manually-merged"}} active selected{{end}}" data-do="manually-merged">{{$.i18n.Tr "repo.pulls.merge_manually"}}</div>
 												{{end}}
 											</div>
 										</div>
-									</div>
-									<form action="{{.Link}}/cancel_auto_merge" method="post">
-										{{.CsrfTokenHtml}}
-										<button class="ui button">{{$.i18n.Tr "repo.pulls.merge_pull_on_success_cancel"}}</button>
-									</form>
-								</div>
-							{{else}}
-								{{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
-									<div class="ui form manually-merged-fields" style="display: none">
-										<form action="{{.Link}}/merge" method="post">
-											{{.CsrfTokenHtml}}
-											<div class="field">
-												<input type="text" name="merge_commit_id"  placeholder="{{$.i18n.Tr "repo.pulls.merge_commit_id"}}">
-											</div>
-											<button class="ui red button" type="submit" name="do" value="manually-merged">
-												{{$.i18n.Tr "repo.pulls.merge_manually"}}
-											</button>
-											<button class="ui button merge-cancel">
-												{{$.i18n.Tr "cancel"}}
-											</button>
-											{{if .IsPullBranchDeletable}}
-												<div class="ui checkbox ml-2">
-													<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
-													<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
-												</div>
-											{{end}}
-										</form>
-									</div>
-								{{end}}
-								<div class="dib">
-									<div class="ui {{if or $notAllOverridableChecksOk .HasPendingPullRequestMerge}}red{{else}}green{{end}} buttons merge-button">
-										<button class="ui button" data-do="{{.MergeStyle}}">
-											{{svg "octicon-git-merge" }}
-											<span class="button-text">
-											{{if eq .MergeStyle "merge"}}
-												{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
-											{{end}}
-											{{if eq .MergeStyle "rebase-merge"}}
-												{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
-											{{end}}
-											{{if eq .MergeStyle "squash"}}
-												{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
-											{{end}}
-											{{if eq .MergeStyle "manually-merged"}}
-												{{$.i18n.Tr "repo.pulls.merge_manually"}}
-											{{end}}
-											</span>
-										</button>
-										{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
-											<div class="ui dropdown icon button no-text">
-												{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-												<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}}
-													{{if $prUnit.PullRequestsConfig.AllowRebase}}
-													<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
-													{{end}}
-													{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
-													<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
-													{{end}}
-													{{if $prUnit.PullRequestsConfig.AllowSquash}}
-													<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
-													{{end}}
-													{{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
-													<div class="item{{if eq .MergeStyle "manually-merged"}} active selected{{end}}" data-do="manually-merged">{{$.i18n.Tr "repo.pulls.merge_manually"}}</div>
-													{{end}}
-												</div>
-											</div>
-										{{end}}
-									</div>
+									{{end}}
 								</div>
-							{{end}}
+							</div>
 							{{if .ShowMergeInstructions}}
 								<div class="instruct-toggle ml-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
 								<div class="instruct-content" style="display:none">
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index 049faa5399b0..a39a704f4793 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -227,31 +227,18 @@ export function initRepoIssueStatusButton() {
 export function initRepoPullRequestMerge() {
   // Pull Request merge button
   const $mergeButton = $('.merge-button > button');
-  const $mergeNowButton = $('.merge-now-button > button');
-  const mergeClickHandler = function (e) {
+  $mergeButton.on('click', function (e) {
     e.preventDefault();
-    $(`.${$(this).attr('data-do')}-fields`).show();
+    $(`.${$(this).data('do')}-fields`).show();
     $(this).parent().hide();
     $('.instruct-toggle').hide();
     $('.instruct-content').hide();
-    $mergeButton.parent().hide();
-    $mergeNowButton.parent().hide();
-  };
-  $mergeButton.on('click', mergeClickHandler);
-  $mergeNowButton.on('click', mergeClickHandler);
+  });
   $('.merge-button > .dropdown').dropdown({
     onChange(_text, _value, $choice) {
-      if ($choice.attr('data-do')) {
+      if ($choice.data('do')) {
         $mergeButton.find('.button-text').text($choice.text());
-        $mergeButton.attr('data-do', $choice.attr('data-do'));
-      }
-    }
-  });
-  $('.merge-now-button > .dropdown').dropdown({
-    onChange(_text, _value, $choice) {
-      if ($choice.attr('data-do')) {
-        $mergeNowButton.find('.button-text').text($choice.text());
-        $mergeNowButton.attr('data-do', $choice.attr('data-do'));
+        $mergeButton.data('do', $choice.data('do'));
       }
     }
   });
@@ -260,7 +247,6 @@ export function initRepoPullRequestMerge() {
     $(this).closest('.form').hide();
     $mergeButton.parent().show();
     $('.instruct-toggle').show();
-    $mergeNowButton.parent().show();
   });
 }