Skip to content

Commit 0e03f19

Browse files
Tomash Sideitomsid
Tomash Sidei
authored andcommitted
Beging to work on issue gogs#3201
1 parent ad7ea88 commit 0e03f19

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

conf/locale/locale_en-US.ini

+1
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ pulls.is_checking = The conflict checking is still in progress, please refresh p
520520
pulls.can_auto_merge_desc = This pull request can be merged automatically.
521521
pulls.cannot_auto_merge_desc = This pull request can't be merged automatically because there are conflicts.
522522
pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
523+
pulls.delete_source_branch = Delete Source Branch
523524
pulls.merge_pull_request = Merge Pull Request
524525
pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
525526

templates/repo/issue/view_content.tmpl

+6
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,12 @@
175175
<div>
176176
<form class="ui form" action="{{.Link}}/merge" method="post">
177177
{{.CsrfTokenHtml}}
178+
<div class="field">
179+
<div class="ui checkbox">
180+
<input type="checkbox" name="example">
181+
<label> {{$.i18n.Tr "repo.pulls.delete_source_branch"}} </label>
182+
</div>
183+
</div>
178184
<button class="ui green button">
179185
<span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}}
180186
</button>

0 commit comments

Comments
 (0)