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.
gitea/templates
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>
7 months ago
..
admin Support delete user email in admin panel (#31690) 7 months ago
api/packages/pypi Fix links in PyPI Simple Repository API page (#30594) 10 months ago
base Refactor repo unit "disabled" check (#31389) 8 months ago
custom
devtest Make toast support preventDuplicates (#31501) 8 months ago
explore Refactor web routes (#30519) 10 months ago
mail Remove unnecessary SanitizeHTML from code (#29575) 12 months ago
org Right align the "Settings" menu item in overflow-menu (#30764) 10 months ago
package Extract and display readme and comments for Composer packages (#30927) 8 months ago
projects Replace `gt-word-break` with `tw-break-anywhere` (#31183) 9 months ago
repo Add warning message in merge instructions when `AutodetectManualMerge` was not enabled (#31805) 7 months ago
shared Improve detecting empty files (#31332) 8 months ago
status Simplify 404/500 page (#31409) 8 months ago
swagger Fix null requested_reviewer from API (#31773) 7 months ago
user add skip secondary authorization option for public oauth2 clients (#31454) 7 months ago
webhook Fix incorrect tailwind migration (#30007) 11 months ago
home.tmpl Migrate margin and padding helpers to tailwind (#30043) 11 months ago
install.tmpl Fix some UI problems (install/checkbox) (#30854) 10 months ago
post-install.tmpl Always use `ctx.Locale.Tr` inside templates (#27231) 1 year ago