kitchen/rice
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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
Conversation 0 Commits 2 Files changed 1 +36 -21
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
hosts/ami/forgejo.nix
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,23 +33,6 @@ in {
SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
};
repository = {
ENABLE_PUSH_CREATE_USER = true;
ENABLE_PUSH_CREATE_ORG = true;
};
server = {
DOMAIN = "buffets.kitchen";
ROOT_URL = "https://buffets.kitchen/";
HTTP_PORT = port;
LANDING_PAGE = "/kitchen";
};
service = {
DISABLE_REGISTRATION = true;
ENABLE_NOTIFY_MAIL = true;
};
"markup.asciidoc" = {
ENABLED = true;
NEED_POSTPROCESS = true;
@ -54,6 +48,27 @@ in {
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;
};
"repository.pull-request" = {
DEFAULT_MERGE_STYLE = "rebase";
};
server = {
DOMAIN = "buffets.kitchen";
ROOT_URL = "https://buffets.kitchen/";
HTTP_PORT = port;
LANDING_PAGE = "/kitchen";
};
service = {
DISABLE_REGISTRATION = true;
ENABLE_NOTIFY_MAIL = true;
};
};
};