feat: default to rebase instead of creating a merge commit #23

Merged
chef merged 2 commits from chef/default-to-rebase into main 2024-06-03 07:16:36 +00:00 AGit
Showing only changes of commit f54c7f1d5f - Show all commits

View file

@ -10,10 +10,21 @@ in {
enable = true;
package = pkgs.unstable.forgejo;
settings = {
DEFAULT.APP_NAME = "buffet's kitchen";
admin.SEND_NOTIFICATION_EMAIL_ON_NEW_USER = true;
cron.ENABLED = true;
federation.ENABLED = true;
DEFAULT = {
APP_NAME = "buffet's kitchen";
};
admin = {
SEND_NOTIFICATION_EMAIL_ON_NEW_USER = true;
};
cron = {
ENABLED = true;
};
federation = {
ENABLED = true;
};
mailer = {
ENABLED = true;
@ -22,6 +33,22 @@ in {
SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
};
"markup.asciidoc" = {
ENABLED = true;
NEED_POSTPROCESS = true;
FILE_EXTENSIONS = ".adoc,.asciidoc";
RENDER_COMMAND = ''"${pkgs.asciidoctor}/bin/asciidoctor -e --safe-mode=secure -a showtitle --out-file=- -"'';
IS_INPUT_FILE = false;
};
"markup.restructuredtext" = {
ENABLED = true;
NEED_POSTPROCESS = true;
FILE_EXTENSIONS = ".rst";
RENDER_COMMAND = ''"timeout 30s ${pkgs.pandoc}/bin/pandoc +RTS -M512M -RTS -f rst"'';
IS_INPUT_FILE = false;
};
repository = {
ENABLE_PUSH_CREATE_USER = true;
ENABLE_PUSH_CREATE_ORG = true;
@ -38,22 +65,6 @@ in {
DISABLE_REGISTRATION = true;
ENABLE_NOTIFY_MAIL = true;
};
"markup.asciidoc" = {
ENABLED = true;
NEED_POSTPROCESS = true;
FILE_EXTENSIONS = ".adoc,.asciidoc";
RENDER_COMMAND = ''"${pkgs.asciidoctor}/bin/asciidoctor -e --safe-mode=secure -a showtitle --out-file=- -"'';
IS_INPUT_FILE = false;
};
"markup.restructuredtext" = {
ENABLED = true;
NEED_POSTPROCESS = true;
FILE_EXTENSIONS = ".rst";
RENDER_COMMAND = ''"timeout 30s ${pkgs.pandoc}/bin/pandoc +RTS -M512M -RTS -f rst"'';
IS_INPUT_FILE = false;
};
};
};