diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-08 09:45:20 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-08 11:07:06 +0300 |
| commit | d1002d1e03be6ceedde6dc152b2d02bc816e47d1 (patch) | |
| tree | aa3a4fd5ebb2bc93fcad8bf6be696bb84a2afdf7 /doc | |
| parent | b39d0c318921bae2e3a11df9ee6828291dad9864 (diff) | |
Merge branch 'rs-pick-security-into-master' into 'master'
Update master with 9.5.4 security patches
See merge request !14131
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/environments.md | 3 | ||||
| -rw-r--r-- | doc/install/database_mysql.md | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index cbf06afa294..c1362b7bd5b 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -446,8 +446,7 @@ and/or `production`) you can see this information in the merge request itself.  -### <a name="route-map"></a>Go directly from source files to public pages on the environment - +### Go directly from source files to public pages on the environment > Introduced in GitLab 8.17. 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: |