赵智超 48842ed108 ui: Show update branch item in merge box when it's necessary (#11761) ... * ui: Show update branch item in merge box when it's necessary As title, should show it without care about whether this pr can be merged. fix #10959 Signed-off-by: a1012112796 <1012112796@qq.com> * fix ui * Fix ui, thanks to @silverwind. Co-authored-by: silverwind <me@silverwind.io> * fix lint * Update templates/repo/issue/view_content/pull.tmpl Co-authored-by: silverwind <me@silverwind.io> * Apply review suggestion Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>		2020-06-13 14:49:59 -04:00
..
branch
diff	Fix to allow comment poster to edit or delete his own comments (#11671)	2020-06-05 13:10:10 +03:00
editor
issue	ui: Show update branch item in merge box when it's necessary (#11761)	2020-06-13 14:49:59 -04:00
pulls
release	Add compare link to releases (#11752)	2020-06-05 14:44:54 -04:00
settings
wiki
activity.tmpl
blame.tmpl
branch_dropdown.tmpl
commit_page.tmpl	Show exact tag for commit on diff view (#11846)	2020-06-11 15:42:55 -04:00
commit_status.tmpl
commits.tmpl
commits_list.tmpl
commits_list_small.tmpl	Fix message wrapping on PR commit list (#11616)	2020-06-03 09:30:34 +01:00
commits_table.tmpl
create.tmpl
empty.tmpl
forks.tmpl
graph.tmpl
header.tmpl	Fix repo internal icon when avatar is present (#11873)	2020-06-13 00:24:41 +03:00
header_icon.tmpl	Fix repo internal icon when avatar is present (#11873)	2020-06-13 00:24:41 +03:00
home.tmpl
migrate.tmpl
migrating.tmpl
search.tmpl
shabox_badge.tmpl
sub_menu.tmpl
user_cards.tmpl
view_file.tmpl
view_list.tmpl	Fix reply octicon (#11821)	2020-06-09 10:13:00 -05:00
watchers.tmpl