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.
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
..
actions Fix ref to trigger Actions (#22679) 1 year ago
branch Add main landmark to templates and adjust titles (#22670) 1 year ago
cite Copy citation file content, in APA and BibTex format, on repo home page (#19999) 2 years ago
diff Fix diff UI for unexpandable items (#22700) 1 year ago
editor Add main landmark to templates and adjust titles (#22670) 1 year ago
find Add main landmark to templates and adjust titles (#22670) 1 year ago
graph Rename almost all Ctx functions (#22071) 2 years ago
issue Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 1 year ago
migrate 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
pulls Add main landmark to templates and adjust titles (#22670) 1 year ago
release Add main landmark to templates and adjust titles (#22670) 1 year ago
settings Add main landmark to templates and adjust titles (#22670) 1 year ago
wiki Add main landmark to templates and adjust titles (#22670) 1 year ago
activity.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
blame.tmpl Show syntax lexer name in file view/blame (#21814) 2 years ago
branch_dropdown.tmpl Fix branch dropdown shifting on page load (#21428) 2 years ago
clone_buttons.tmpl Rework repo buttons (#20602) 2 years ago
clone_script.tmpl Make the vscode clone link respect transport protocol (#20557) 2 years ago
commit_page.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
commit_status.tmpl Change commit status icons to SVG (#20736) 2 years ago
commit_statuses.tmpl Fixes accessibility of empty repository commit status (#22632) 1 year ago
commits.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
commits_list.tmpl Change `commits-table` column width (#21564) 2 years ago
commits_list_small.tmpl Add whitespace removal inside template curly brackes (#20853) 2 years ago
commits_table.tmpl Add whitespace removal inside template curly brackes (#20853) 2 years ago
create.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
create_helper.tmpl Add templates to customize text when creating and migrating repositories 1 year ago
empty.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
file_info.tmpl Show syntax lexer name in file view/blame (#21814) 2 years ago
forks.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
graph.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
header.tmpl Fixes accessibility behavior of Watching, Staring and Fork buttons (#22634) 1 year ago
home.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 4 years ago
packages.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
search.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago
shabox_badge.tmpl Refactor `i18n` to `locale` (#20153) 2 years ago
sub_menu.tmpl Render number of commits in repo page in a user friendly way (#21786) 2 years ago
unicode_escape_prompt.tmpl Switch Unicode Escaping to a VSCode-like system (#19990) 2 years ago
upload.tmpl Refactor `i18n` to `locale` (#20153) 2 years ago
user_cards.tmpl Localize all timestamps (#21440) 2 years ago
view_file.tmpl Ensure that plain files are rendered correctly even when containing ambiguous characters (#22017) 2 years ago
view_list.tmpl Add whitespace removal inside template curly brackes (#20853) 2 years ago
watchers.tmpl Add main landmark to templates and adjust titles (#22670) 1 year ago