gitea

mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00

Files

T

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](https://github.com/go-gitea/gitea/blob/36dc11869d0401b796a7a3f74627fec842a4a89a/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 )