a1012112796 e5f8d144f2 [PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) ... --- Conflict resolution: trivial Things done differently: Improve localization message, use the paragraph element instead of the div element, fix passing this variable to the template and add a integration test (cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d)		2024-08-11 19:15:37 +02:00
..
api	Merge pull request 'chore(refactor): split repo_service.ForkRepository in two' (#4879) from earl-warren/forgejo:wip-fork-split into forgejo	2024-08-11 15:50:52 +00:00
common	Revert "Open telemetry integration (#3972)"	2024-08-07 11:22:43 +02:00
install	Revert "Open telemetry integration (#3972)"	2024-08-07 11:22:43 +02:00
private	feat(quota): Quota enforcement	2024-08-02 11:10:34 +02:00
utils
web	[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)	2024-08-11 19:15:37 +02:00
init.go	Revert "Open telemetry integration (#3972)"	2024-08-07 11:22:43 +02:00