meissa
/
forgejo
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo-federated-star
forgejo
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '891391689a'
${ noResults }
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>
 		1 year ago
..
admin Add main landmark to templates and adjust titles (#22670) 1 year ago
api/packages/pypi Add Package Registry (#16510) 2 years ago
base Improve accessibility of navigation bar and footer (#22635) 1 year ago
code Run `make fmt` (#21437) 2 years ago
custom Add footer extra links template (#9576) 5 years ago
explore Add main landmark to templates and adjust titles (#22670) 1 year ago
mail Add reply hint to mail text (#22459) 1 year ago
org Add main landmark to templates and adjust titles (#22670) 1 year ago
package Add main landmark to templates and adjust titles (#22670) 1 year ago
projects Add main landmark to templates and adjust titles (#22670) 1 year ago
repo Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 1 year ago
shared Add user secrets (#22191) 1 year ago
status Add main landmark to templates and adjust titles (#22670) 1 year ago
swagger Add Conda package registry (#22262) 1 year ago
user set user dashboard org visibility to basic (#22706) 1 year ago
home.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
install.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
post-install.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago