MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-15 06:21:23 +01:00
Code Issues Releases Wiki Activity
gitea/templates/repo
History
a1012112796 9633f336c8
Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 
not enabled

quick-f-i-x https://github.com/go-gitea/gitea/issues/31433 ? , maybe
need more disscusion about better solutions.

example view:


![image](https://github.com/user-attachments/assets/2af7e1e8-42b9-4473-89c7-12d4a9205d3f)

adtion notes about how to enable `AutodetectManualMerge`


![image](https://github.com/user-attachments/assets/28f84317-367a-40d8-b50d-a19ef7c664d4)

Signed-off-by: a1012112796 <1012112796@qq.com>
2024-08-10 01:09:34 +00:00
..
actions Improve job commit description (#30579) 2024-04-26 02:22:45 +00:00
branch Don't include link of deleted branch when listing branches (#31028) 2024-05-21 02:23:07 +00:00
cite Fix Citation modal responsiveness and clipboard copy (#29799) 2024-03-15 02:38:13 +00:00
code Fix overflow on push notification (#31179) 2024-06-04 07:14:24 +00:00
diff Refactor image diff (#31444) 2024-06-22 04:52:09 +00:00
editor Code editor theme enhancements (#31629) 2024-07-14 23:22:48 +00:00
find Migrate gt-hidden to tw-hidden (#30046) 2024-03-24 18:23:38 +00:00
graph Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
issue Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
migrate Fix "force private" logic (#31012) 2024-05-20 00:56:45 +00:00
projects Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
pulls Prevent tab shifting, remove extra margin on fluid pages (#31090) 2024-05-27 06:45:16 +00:00
release Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
settings Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
tag Restyle release list, fix branch dropdown (#30837) 2024-05-13 23:33:51 +02:00
wiki Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
activity.tmpl Implement recent commits graph (#29210) 2024-02-24 10:22:51 +00:00
blame.tmpl Fix the link for .git-blame-ignore-revs bypass (#31432) 2024-06-20 23:28:34 +00:00
branch_dropdown.tmpl Fix some UI problems (dropdown/container) (#30849) 2024-05-06 07:17:22 +00:00
clone_buttons.tmpl Improve repo button row layout (#30668) 2024-05-02 19:10:49 +00:00
clone_script.tmpl Fix URL calculation in clone input box (#29470) 2024-02-28 15:04:04 +00:00
code_frequency.tmpl Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
commit_load_branches_and_tags.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-24 18:23:38 +00:00
commit_page.tmpl Fix all rounded borders, change affected tab menus to pills (#30707) 2024-04-29 20:53:15 +00:00
commit_status.tmpl Restore warning commit status (#27504) 2023-10-08 22:16:06 +00:00
commit_statuses.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-22 13:45:10 +00:00
commits.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
commits_list.tmpl Fix author name alignment in commits table (#30396) 2024-04-11 03:16:44 +00:00
commits_list_small.tmpl Fix some UI regressions for commit list (#30920) 2024-05-10 12:58:05 +00:00
commits_search_dropdown.tmpl Unify search boxes (#29530) 2024-03-14 23:24:59 +00:00
commits_table.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
contributors.tmpl Fix Activity Page Contributors dropdown (#31264) 2024-06-06 10:28:33 +08:00
create.tmpl Fix "force private" logic (#31012) 2024-05-20 00:56:45 +00:00
create_helper.tmpl Remove incorrect and unnecessary Escape from templates (#29394) 2024-02-25 14:02:20 +00:00
empty.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
file_info.tmpl Improve detecting empty files (#31332) 2024-06-13 01:06:46 +00:00
forks.tmpl Migrate margin and padding helpers to tailwind (#30043) 2024-03-24 17:42:49 +01:00
graph.tmpl Migrate gt-hidden to tw-hidden (#30046) 2024-03-24 18:23:38 +00:00
header.tmpl Refactor repo unit "disabled" check (#31389) 2024-06-18 00:51:13 +00:00
home.tmpl Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
icon.tmpl Replace 10 more gt- classes with tw- (#29945) 2024-03-22 13:45:10 +00:00
latest_commit.tmpl Fix DEFAULT_SHOW_FULL_NAME=false has no effect in commit list and commit graph page (#30096) 2024-03-28 15:15:39 -04:00
navbar.tmpl Implement recent commits graph (#29210) 2024-02-24 10:22:51 +00:00
packages.tmpl Fix inconsistent user profile layout across tabs (#25625) 2023-07-06 18:59:24 +00:00
pulse.tmpl Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
recent_commits.tmpl Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
release_tag_header.tmpl Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
search.tmpl Unify search boxes (#29530) 2024-03-14 23:24:59 +00:00
search_name.tmpl
shabox_badge.tmpl Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
star_unstar.tmpl code optimization (#31315) 2024-06-11 21:07:10 +08:00
sub_menu.tmpl Refactor web routes (#30519) 2024-04-17 08:31:37 +00:00
unicode_escape_prompt.tmpl Replace some gt- classes with tw- (#29570) 2024-03-04 03:33:20 +00:00
upload.tmpl Always use ctx.Locale.Tr inside templates (#27231) 2023-09-25 08:56:50 +00:00
user_cards.tmpl Always use HTML attributes for avatar size (#31509) 2024-06-28 21:29:15 +00:00
view_file.tmpl Improve detecting empty files (#31332) 2024-06-13 01:06:46 +00:00
view_list.tmpl Fix view of readme file in the home code page. (#30564) 2024-04-25 00:07:38 +00:00
watch_unwatch.tmpl Tweak repo buttons on mobile and labeled button border-radius (#30503) 2024-04-16 17:46:12 +02:00
watchers.tmpl