update app.ini

3 files changed, 20 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1aefcd70675d..8b8008388fbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = r4795.369972b1
+	pkgver = r4805.8bc43195
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -31,7 +31,7 @@ pkgbase = gitea-git
 	source = gitea.tmpfiles
 	sha256sums = SKIP
 	sha256sums = f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9
-	sha256sums = 9748d8993198df218eeb2ad04b70d21393f0e9d5828d5e5c7d75334100c2dc6e
+	sha256sums = d2cbe28275cf97d54d1fbf5c30ff0becb7caa3555f702282c20cb34b6435204d
 	sha256sums = d8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b
 	sha256sums = 5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d
 
diff --git a/PKGBUILD b/PKGBUILD
index 425de9b262f6..25368bffc14b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=gitea
 _gourl="code.gitea.io"
 pkgname=gitea-git
-pkgver=r4795.369972b1
+pkgver=r4805.8bc43195
 pkgrel=1
 pkgdesc='A painless self-hosted Git service.'
 url='https://gitea.io/'
@@ -19,7 +19,7 @@ source=('git://github.com/go-gitea/gitea.git'
         'gitea.tmpfiles')
 sha256sums=('SKIP'
             'f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9'
-            '9748d8993198df218eeb2ad04b70d21393f0e9d5828d5e5c7d75334100c2dc6e'
+            'd2cbe28275cf97d54d1fbf5c30ff0becb7caa3555f702282c20cb34b6435204d'
             'd8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b'
             '5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d')
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
diff --git a/app.ini b/app.ini
index 5a16dc538eee..7a1cacbb2b55 100644
--- a/app.ini
+++ b/app.ini
@@ -57,6 +57,8 @@ FEED_MAX_COMMIT_NUM = 5
 THEME_COLOR_META_TAG = `#6cc644`
 ; Max size of files to be displayed (defaults is 8MiB)
 MAX_DISPLAY_FILE_SIZE = 8388608
+; Whether show the user email in the Explore Users page
+SHOW_USER_EMAIL = true
 
 [ui.admin]
 ; Number of users that are showed in one page
@@ -159,6 +161,7 @@ PATH = /var/lib/gitea/data/gogs.db
 [admin]
 
 [security]
+; Whether the installer is disabled
 INSTALL_LOCK = false
 ; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
 SECRET_KEY = !#@FDEWREWR&*(
@@ -170,6 +173,8 @@ COOKIE_REMEMBER_NAME = gitea_incredible
 REVERSE_PROXY_AUTHENTICATION_USER = X-WEBAUTH-USER
 ; Sets the minimum password length for new Users
 MIN_PASSWORD_LENGTH = 6
+; True when users are allowed to import local server paths
+IMPORT_LOCAL_PATHS = false
 
 [service]
 ACTIVE_CODE_LIVE_MINUTES = 180
@@ -187,6 +192,13 @@ ENABLE_REVERSE_PROXY_AUTHENTICATION = false
 ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ; Enable captcha validation for registration
 ENABLE_CAPTCHA = true
+; Default value for KeepEmailPrivate
+; New user will get the value of this setting copied into their profile
+DEFAULT_KEEP_EMAIL_PRIVATE = false
+; Default value for the domain part of the user's email address in the git log
+; if he has set KeepEmailPrivate true. The user's email replaced with a
+; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
+NO_REPLY_ADDRESS = noreply.example.org
 
 [webhook]
 ; Hook task queue length, increase if webhook shooting starts hanging
@@ -251,7 +263,7 @@ PROVIDER = memory
 ; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
 PROVIDER_CONFIG = /var/lib/gitea/data/sessions
 ; Session cookie name
-COOKIE_NAME = i_like_gogits
+COOKIE_NAME = i_like_gitea
 ; If you use session in https only, default is false
 COOKIE_SECURE = false
 ; Enable set cookie, default is true
@@ -279,7 +291,7 @@ ENABLE = true
 ; Path for attachments. Defaults to `data/attachments`
 PATH = /var/lib/gitea/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|application/zip|application/gzip
 ; Max size of each file. Defaults to 32MB
 MAX_SIZE = 4
 ; Max number of files per upload. Defaults to 10
@@ -341,7 +353,7 @@ HOST =
 ; Mailer user name and password
 USER =
 PASSWD =
-; Receivers, can be one or more, e.g. ["1@example.com","2@example.com"]
+; Receivers, can be one or more, e.g. 1@example.com,2@example.com
 RECEIVERS =
 
 ; For "database" mode only
@@ -406,7 +418,7 @@ MAX_RESPONSE_ITEMS = 50
 
 [i18n]
 LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
-NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어
 
 ; Used for datetimepicker
 [i18n.datelang]