troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 19:11:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
forgejo/templates
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
..
admin Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
api/packages/pypi Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
base Improve accessibility of navigation bar and footer (#22635) 2023-01-29 09:29:10 +08:00
code Run make fmt (#21437) 2022-10-13 21:33:54 -04:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
mail Add reply hint to mail text (#22459) 2023-01-16 14:58:01 -06:00
org Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
package Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
projects Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
repo Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 2023-02-03 14:24:45 +08:00
shared Add user secrets (#22191) 2023-02-01 20:53:04 +08:00
status Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
swagger Add Conda package registry (#22262) 2023-02-01 12:30:39 -06:00
user set user dashboard org visibility to basic (#22706) 2023-02-02 14:53:14 +08:00
home.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
install.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
post-install.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00