troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:49:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
forgejo/templates/repo
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
..
actions Fix ref to trigger Actions (#22679) 2023-01-31 22:45:25 +00:00
branch Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
cite Copy citation file content, in APA and BibTex format, on repo home page (#19999) 2022-11-11 18:02:50 +01:00
diff Fix diff UI for unexpandable items (#22700) 2023-02-02 13:39:55 +08:00
editor Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
find Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
graph Rename almost all Ctx functions (#22071) 2022-12-10 10:46:31 +08:00
issue Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) 2023-02-03 14:24:45 +08:00
migrate 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
pulls Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
release Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
settings Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
wiki Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
activity.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
blame.tmpl Show syntax lexer name in file view/blame (#21814) 2022-11-19 13:08:06 +02:00
branch_dropdown.tmpl Fix branch dropdown shifting on page load (#21428) 2022-10-19 13:39:55 +08:00
clone_buttons.tmpl Rework repo buttons (#20602) 2022-08-08 02:15:11 +03:00
clone_script.tmpl Make the vscode clone link respect transport protocol (#20557) 2022-09-09 02:38:51 -04:00
commit_page.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
commit_status.tmpl Change commit status icons to SVG (#20736) 2022-08-09 23:55:29 +02:00
commit_statuses.tmpl Fixes accessibility of empty repository commit status (#22632) 2023-01-28 00:40:17 +02:00
commits.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
commits_list.tmpl Change commits-table column width (#21564) 2022-10-25 18:00:37 +01:00
commits_list_small.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
commits_table.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
create.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
create_helper.tmpl Add templates to customize text when creating and migrating repositories 2023-01-24 22:36:48 -05:00
empty.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
file_info.tmpl Show syntax lexer name in file view/blame (#21814) 2022-11-19 13:08:06 +02:00
forks.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
graph.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
header.tmpl Fixes accessibility behavior of Watching, Staring and Fork buttons (#22634) 2023-01-31 16:28:43 +01:00
home.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
icon.tmpl
packages.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
search.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00
shabox_badge.tmpl Refactor i18n to locale (#20153) 2022-06-27 15:58:46 -05:00
sub_menu.tmpl Render number of commits in repo page in a user friendly way (#21786) 2022-11-13 00:55:19 -05:00
unicode_escape_prompt.tmpl Switch Unicode Escaping to a VSCode-like system (#19990) 2022-08-13 19:32:34 +01:00
upload.tmpl Refactor i18n to locale (#20153) 2022-06-27 15:58:46 -05:00
user_cards.tmpl Localize all timestamps (#21440) 2022-10-17 12:08:21 +08:00
view_file.tmpl Ensure that plain files are rendered correctly even when containing ambiguous characters (#22017) 2022-12-17 22:22:25 +02:00
view_list.tmpl Add whitespace removal inside template curly brackes (#20853) 2022-08-25 17:55:52 -04:00
watchers.tmpl Add main landmark to templates and adjust titles (#22670) 2023-02-01 22:56:10 +00:00