diff options
| author | jladbrook <jhladbrook@gmail.com> | 2023-02-03 06:24:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 14:24:45 +0800 |
| commit | 891391689a26e0bc3dcb1558512d3c2b6857232d (patch) | |
| tree | 494d4988d1e6f6f2b9251d68b1b43689d4f5b6f4 /cmd | |
| parent | 82728a7cecfe4d254890545fea49d6afde4f40db (diff) | |
| download | gitea-891391689a26e0bc3dcb1558512d3c2b6857232d.tar.gz gitea-891391689a26e0bc3dcb1558512d3c2b6857232d.zip | |
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:
Updated UI adding the update button:
## 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>
Diffstat (limited to 'cmd')
0 files changed, 0 insertions, 0 deletions