forgejo: change default PR merge strategy to rebase

This commit is contained in:
Finn 2024-09-07 23:27:37 -07:00
parent 3a39864ca6
commit 62d0e4ba6c

View file

@ -29,6 +29,7 @@ data:
FORGEJO__server__ROOT_URL: https://git.janky.solutions/ FORGEJO__server__ROOT_URL: https://git.janky.solutions/
FORGEJO__server__DOMAIN: git.janky.solutions FORGEJO__server__DOMAIN: git.janky.solutions
FORGEJO__DEFAULT__APP_NAME: Janky Solutions FORGEJO__DEFAULT__APP_NAME: Janky Solutions
DEFAULT_MERGE_STYLE: rebase
# FORGEJO__storage__STORAGE_TYPE: minio # FORGEJO__storage__STORAGE_TYPE: minio
# FORGEJO__storage__MINIO_ENDPOINT: storage.home.finn.io # FORGEJO__storage__MINIO_ENDPOINT: storage.home.finn.io
# FORGEJO__storage__MINIO_USE_SSL: "true" # FORGEJO__storage__MINIO_USE_SSL: "true"