mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-26 00:03:35 +01:00
891391689a
Fix #21740.
Updated the Pull Request template so that the 'Update branch by merge'
button is visible for WIP PR's. Making the behaviour match a non WIP-PR.
Previous WIP page with changes pending on the branch:
![image](https://user-images.githubusercontent.com/1656302/215738307-e68a2f92-5ff8-4f48-a541-35ca81d1f1a4.png)
Updated UI adding the update button:
![image](https://user-images.githubusercontent.com/1656302/215737872-e0e9d712-b7aa-4b90-b7ed-6a92a14fc182.png)
## Notes
* have not removed the **$canAutoMerge** variable from the pull.tmpl on
this
[line](
|
||
---|---|---|
.. | ||
add_reaction.tmpl | ||
attachments.tmpl | ||
comments.tmpl | ||
comments_delete_time.tmpl | ||
context_menu.tmpl | ||
pull.tmpl | ||
pull_merge_instruction.tmpl | ||
reactions.tmpl | ||
reference_issue_dialog.tmpl | ||
sidebar.tmpl | ||
update_branch_by_merge.tmpl |