From 8a2156b907d8010926695b1e584da7c299b9d71a Mon Sep 17 00:00:00 2001 From: jerger Date: Wed, 3 Aug 2022 16:44:35 +0200 Subject: [PATCH] merged --- src/main/resources/gitea/appini-env-configmap.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/resources/gitea/appini-env-configmap.yaml b/src/main/resources/gitea/appini-env-configmap.yaml index 7492025..000a63e 100644 --- a/src/main/resources/gitea/appini-env-configmap.yaml +++ b/src/main/resources/gitea/appini-env-configmap.yaml @@ -52,12 +52,8 @@ data: #[picture] GITEA__picture__AVATAR_UPLOAD_PATH: /data/gitea/avatars GITEA__picture__REPOSITORY_AVATAR_UPLOAD_PATH: /data/gitea/repo-avatars -<<<<<<< HEAD - GITEA__picture__DISABLE_GRAVATAR: "false" -======= - GITEA__picture__DISABLE_GRAVATAR: "true" + GITEA__picture__DISABLE_GRAVATAR: "false" GITEA__picture__ENABLE_FEDERATED_AVATAR: "true" # Enable support for federated avatars (see http://www.libravatar.org). ->>>>>>> 9f818cf321ebc7af97f44980f1a60399f05488a4 #[repository] GITEA__repository__ROOT: /data/git/repositories @@ -78,14 +74,7 @@ data: #[service] GITEA__service__DISABLE_REGISTRATION: "false" GITEA__service__REQUIRE_SIGNIN_VIEW: "false" -<<<<<<< HEAD GITEA__service__REGISTER_EMAIL_CONFIRM: "true" -======= - GITEA__service__REGISTER_EMAIL_CONFIRM: "true" # Enable this to ask for mail confirmation of registration. Requires "Mailer" to be enabled. - #TODO: Configure Mailer using smtp: https://docs.gitea.io/en-us/email-setup/#using-smtp - - ->>>>>>> 9f818cf321ebc7af97f44980f1a60399f05488a4 GITEA__service__ENABLE_NOTIFY_MAIL: "true" GITEA__service__EMAIL_DOMAIN_WHITELIST: WHITELISTDOMAINS GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION: "false"