diff options
| author | mharinder <mharinder@yandex.com> | 2017-10-01 05:37:24 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-15 23:28:23 -0500 |
| commit | 5cd1fdeb9ee1af1179a859dc5ed65561bfe5a6d6 (patch) | |
| tree | f0c36bfd3a763cf7489da93d4d015c8c7fd252b6 /templates/repo/issue | |
| parent | dbe6de313efdff942d16b82b63f02fa10d8fc170 (diff) | |
pull: add an option to use rebase for merging pull requests
For DVCS, either merge or rebase works for getting new code in a pull
request in the main branch.
The rebase workflow produces a linear history which is cleaner, and
more bisect-able.
This commit adds a repo-level option to enable the rebase workflow. Once
enabled, "Merge Pull Request" will be replaced by
"Rebase and Merge Pull Request" which does exactly what the user wants.
It's unlikely a project wants a mixed-use of both rebase and merge
workflows, therefore the feature is not implemented as a drop-down
button like what GitHub does
(https://github.com/blog/2243-rebase-and-merge-pull-requests).
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 88f66ef9..f9cf63bf 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -196,7 +196,11 @@ <form class="ui form" action="{{.Link}}/merge" method="post"> {{.CSRFTokenHTML}} <button class="ui green button"> - <span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}} + {{if .Issue.Repo.PullUseRebase }} + <span class="octicon octicon-git-pull-request"></span> {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}} + {{else}} + <span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}} + {{end}} </button> </form> </div> |