mirror/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-21 01:14:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
9633f336c8
gitea/templates
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
..
admin Support delete user email in admin panel (#31690) 2024-07-25 18:11:04 +08:00
api/packages/pypi Fix links in PyPI Simple Repository API page (#30594) 2024-04-20 01:15:14 +00:00
base Refactor repo unit "disabled" check (#31389) 2024-06-18 00:51:13 +00:00
custom
devtest Make toast support preventDuplicates (#31501) 2024-06-27 13:58:38 +00:00
explore
mail
org Right align the "Settings" menu item in overflow-menu (#30764) 2024-04-30 04:26:13 +00:00
package Extract and display readme and comments for Composer packages (#30927) 2024-06-14 04:45:52 +00:00
projects Replace gt-word-break with tw-break-anywhere (#31183) 2024-06-04 13:57:11 +00:00
repo Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
shared Improve detecting empty files (#31332) 2024-06-13 01:06:46 +00:00
status Simplify 404/500 page (#31409) 2024-06-23 17:45:21 +00:00
swagger Fix null requested_reviewer from API (#31773) 2024-08-05 10:59:53 +00:00
user add skip secondary authorization option for public oauth2 clients (#31454) 2024-07-19 14:28:30 -04:00
webhook
home.tmpl
install.tmpl Fix some UI problems (install/checkbox) (#30854) 2024-05-06 06:32:05 +00:00
post-install.tmpl