diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2021-07-13 01:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 01:26:25 +0200 |
| commit | 78118a3b029ee4eb140d47be22e86df17253a786 (patch) | |
| tree | 81aaa17946b3bd8086cdb6e23ca4349dea118f50 /templates | |
| parent | 46a4c6835daf4642074bb1a18a3210b03a64259b (diff) | |
| download | gitea-78118a3b029ee4eb140d47be22e86df17253a786.tar.gz gitea-78118a3b029ee4eb140d47be22e86df17253a786.zip | |
Add checkbox to delete pull branch after successful merge (#16049)
* Add checkbox to delete pull branch after successful merge
* Omit DeleteBranchAfterMerge field in json
* Log a warning instead of error when PR head branch deleted
* Add DefaultDeleteBranchAfterMerge to PullRequestConfig
* Add support for delete_branch_after_merge via API
* Fix for API: the branch should be deleted from the HEAD repo
If head and base repo are the same, reuse the already opened ctx.Repo.GitRepo
* Don't delegate to CleanupBranch, only reuse branch deletion code
CleanupBranch contains too much logic that has already been performed by the Merge
* Reuse gitrepo in MergePullRequest
Co-authored-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 30 | ||||
| -rw-r--r-- | templates/repo/settings/options.tmpl | 6 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 9 |
3 files changed, 45 insertions, 0 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 3bdec4becb..fcb3597ae8 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -315,6 +315,12 @@ <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}} @@ -328,6 +334,12 @@ <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}} @@ -347,6 +359,12 @@ <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}} @@ -366,6 +384,12 @@ <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}} @@ -382,6 +406,12 @@ <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}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index eb76a3b720..054df7c368 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -446,6 +446,12 @@ </div> </div> <div class="field"> + <div class="ui checkbox"> + <input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label> + </div> + </div> + <div class="field"> <p> {{.i18n.Tr "repo.settings.default_merge_style_desc"}} </p> diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 669e3552cc..de61b9dd29 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -14058,6 +14058,11 @@ "type": "string", "x-go-name": "DefaultBranch" }, + "default_delete_branch_after_merge": { + "description": "set to `true` to delete pr branch after merge by default", + "type": "boolean", + "x-go-name": "DefaultDeleteBranchAfterMerge" + }, "default_merge_style": { "description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", or \"squash\". `has_pull_requests` must be `true`.", "type": "string", @@ -15137,6 +15142,10 @@ "MergeTitleField": { "type": "string" }, + "delete_branch_after_merge": { + "type": "boolean", + "x-go-name": "DeleteBranchAfterMerge" + }, "force_merge": { "type": "boolean", "x-go-name": "ForceMerge" |