diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-30 20:34:34 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-08 03:22:16 +0300 |
| commit | 9b09856e7b853146ac4ff03d388f7063e6f0efbd (patch) | |
| tree | 07917aaf32abdeed859fe5357ab0912e696f914e /doc/install | |
| parent | 8629d5822a1a7af5708ebb785982b25e0d2400bf (diff) | |
Merge branch 'rs-issue-36104' into 'security-9-5'
[9.5] Disallow the `name` attribute on all user-provided markup
See merge request gitlab/gitlabhq!2166
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/database_mysql.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md index bc75dc1447e..5c128f54a76 100644 --- a/doc/install/database_mysql.md +++ b/doc/install/database_mysql.md @@ -75,7 +75,7 @@ log_bin_trust_function_creators=1 ### MySQL utf8mb4 support -After installation or upgrade, remember to [convert any new tables](#convert) to `utf8mb4`/`utf8mb4_general_ci`. +After installation or upgrade, remember to [convert any new tables](#tables-and-data-conversion-to-utf8mb4) to `utf8mb4`/`utf8mb4_general_ci`. --- @@ -230,7 +230,6 @@ We need to check, enable and probably convert your existing GitLab DB tables to > Now, ensure that [innodb_file_format](https://dev.mysql.com/doc/refman/5.6/en/tablespace-enabling.html) and [innodb_large_prefix](http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_large_prefix) are **persisted** in your `my.cnf` file. #### Tables and data conversion to utf8mb4 -<a name="convert"></a> Now that you have a persistent MySQL setup, you can safely upgrade tables after setup or upgrade time: |