Merge branch 'master' into dist/eole/2.7.2/master

This commit is contained in:
Philippe Caseiro 2021-05-26 11:44:29 +02:00
commit c550fbe517
1 changed files with 11 additions and 7 deletions

View File

@ -236,13 +236,17 @@ AVATAR_UPLOAD_PATH = data/avatars
GRAVATAR_SOURCE = gravatar
DISABLE_GRAVATAR = false
[repository.upload]
ALLOWED_TYPES = application/zip|application/gzip|application/x-gzip|application/x-gtar|application/x-tgz|application/x-compressed-tar|text/plain
[attachment]
; Whether attachments are enabled. Defaults to `true`
ENABLE = true
; Path for attachments. Defaults to `data/attachments`
PATH = data/attachments
; One or more allowed types, e.g. image/jpeg|image/png
ALLOWED_TYPES = image/jpeg|image/png
; ALLOWED_TYPES = image/jpeg|image/png
ALLOWED_TYPES = */*
; Max size of each file. Defaults to 32MB
MAX_SIZE = 32
; Max number of files per upload. Defaults to 10
@ -262,15 +266,15 @@ MODE = console, file
; Buffer length of channel, keep it as it is if you don't know what it is.
BUFFER_LEN = 10000
; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
LEVEL = Trace
LEVEL = Info
; For "console" mode only
[log.console]
LEVEL =
LEVEL = Info
; For "file" mode only
[log.file]
LEVEL =
LEVEL = Info
; This enables automated log rotate(switch of following options), default is true
LOG_ROTATE = true
; Max line number of single file, default is 1000000
@ -284,7 +288,7 @@ MAX_DAYS = 7
; For "conn" mode only
[log.conn]
LEVEL =
LEVEL = Info
; Reconnect host for every single message, default is false
RECONNECT_ON_MSG = false
; Try to reconnect when connection is lost, default is false
@ -296,7 +300,7 @@ ADDR =
; For "smtp" mode only
[log.smtp]
LEVEL =
LEVEL = Info
; Name displayed in mail title, default is "Diagnostic message from serve"
SUBJECT = Diagnostic message from serve
; Mail server
@ -309,7 +313,7 @@ RECEIVERS =
; For "database" mode only
[log.database]
LEVEL =
LEVEL = Info
; Either "mysql" or "postgres"
DRIVER =
; Based on xorm, e.g.: root:root@localhost/gitea?charset=utf8