mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-28 06:33:50 +03:00
13ca6c14f1
This commit allows chaning default branch update style through global and repository settings. The setting affects "Update branch" button in PR view (button shows when some commits are ahead of master branch). When default update style is set to "rebase", dropdown button updates branch by rebase by default. When update style is set to other value, dropdown button updates branch by merge. Any of these actions may be selected using dropdown in any case. Signed-off-by: George Bartolomey <george@bh4.ru> |
||
|---|---|---|
| .. | ||
| sidebar | ||
| add_reaction.tmpl | ||
| attachments.tmpl | ||
| comments.tmpl | ||
| comments_authorlink.tmpl | ||
| comments_delete_time.tmpl | ||
| context_menu.tmpl | ||
| conversation.tmpl | ||
| pull.tmpl | ||
| pull_merge_instruction.tmpl | ||
| reactions.tmpl | ||
| reference_issue_dialog.tmpl | ||
| show_role.tmpl | ||
| sidebar.tmpl | ||
| update_branch_by_merge.tmpl | ||