summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-05-24 12:15:26 +0800
committertechknowlogick <techknowlogick@gitea.io>2019-05-24 00:15:26 -0400
commitd5a98a29690e13f717fb72e8635fbea57e58f546 (patch)
treeb956c947814221d7a03bebc8516323266e81660e /options
parent181b7c99eddb373b4415b160dde9109cd4191878 (diff)
downloadgitea-d5a98a29690e13f717fb72e8635fbea57e58f546.tar.gz
gitea-d5a98a29690e13f717fb72e8635fbea57e58f546.zip
Add support of utf8mb4 for mysql (#6992)
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a85221ab74..f08bc6b5a5 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -86,8 +86,9 @@ host = Host
user = Username
password = Password
db_name = Database Name
-db_helper = Note to MySQL users: please use the InnoDB storage engine and the 'utf8_general_ci' character set.
+db_helper = Note to MySQL users: please use the InnoDB storage engine and if you use "utf8mb4", your InnoDB version must be greater than 5.6 .
ssl_mode = SSL
+charset = Charset
path = Path
sqlite_helper = File path for the SQLite3 database.<br>Enter an absolute path if you run Gitea as a service.
err_empty_db_path = The SQLite3 database path cannot be empty.