MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-05 16:47:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
9633f336c8
gitea/routers/web
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
auth OIDC: case-insensitive comparison for auth scheme Basic (#31706) 2024-07-26 19:51:45 +00:00
devtest Refactor names (#31405) 2024-06-19 06:32:45 +08:00
events Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00
explore Refactor names (#31405) 2024-06-19 06:32:45 +08:00
feed Use GetDisplayName() instead of DisplayName() to generate rss feeds (#31687) 2024-07-25 17:33:02 +08:00
healthcheck Always enable caches (#28527) 2023-12-19 09:29:05 +00:00
misc Make sure git version&feature are always prepared (#30877) 2024-05-06 18:34:16 +02:00
org Add issue comment when moving issues from one column to another of the project (#29311) 2024-08-09 01:29:02 +00:00
repo Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) 2024-08-10 01:09:34 +00:00
shared Refactor names (#31405) 2024-06-19 06:32:45 +08:00
user Hide the "Details" link of commit status when the user cannot access actions (#30156) 2024-07-28 23:11:40 +08:00
base.go Azure blob storage support (#30995) 2024-05-30 07:33:50 +00:00
githttp.go Refactor names (#31405) 2024-06-19 06:32:45 +08:00
goget.go Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00
home.go migrate some more "OptionalBool" to "Option[bool]" (#29479) 2024-02-29 18:52:49 +00:00
metrics.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
nodeinfo.go Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00
passkey.go Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00
swagger_json.go Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00
web.go Support delete user email in admin panel (#31690) 2024-07-25 18:11:04 +08:00
webfinger.go Move context from modules to services (#29440) 2024-02-27 08:12:22 +01:00