mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-03-07 01:31:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
forgejo/templates/repo/issue/view_content
History
jladbrook 891391689a
Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 
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](36dc11869d/templates/repo/issue/view_content/pull.tmpl (L131))
- doesn't appear to be used elsewhere but wasn't sure
* In order to avoid duplicating code corresponding UI code was added to
a new tmpl file, ```update_branch_by_merge.tmpl``` and is called in two
places from ```pull.tmpl```.

---------

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-02-03 14:24:45 +08:00
..
add_reaction.tmpl Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
attachments.tmpl Remove fomantic image module (#21145) 2022-09-12 17:08:46 +08:00
comments.tmpl Mute all links in issue timeline (#22533) 2023-01-20 12:00:32 +08:00
comments_delete_time.tmpl Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
context_menu.tmpl Change ID pattern of raw content container for issue (#21966) 2022-12-10 00:25:32 +08:00
pull.tmpl Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 2023-02-03 14:24:45 +08:00
pull_merge_instruction.tmpl Refactor i18n to locale (#20153) 2022-06-27 15:58:46 -05:00
reactions.tmpl Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
reference_issue_dialog.tmpl Make sure fmt catches all templates (#20979) 2022-08-31 23:58:54 +08:00
sidebar.tmpl Fix missing title and filter in issue sidebar project menu (#22557) 2023-01-31 22:40:38 +00:00
update_branch_by_merge.tmpl Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 2023-02-03 14:24:45 +08:00