diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2014-10-21 14:03:25 +0400 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2014-10-21 14:03:25 +0400 |
| commit | f28df34a4dbbd09ce6b6a7e9f70ccfd9c343e141 (patch) | |
| tree | 5e9db88ff23331e6532d1fbb3ff22a41fdeee4b4 /doc | |
| parent | e73a4eeafb64d8f7bbaf01ac52d8b2dc3c2d916a (diff) | |
| parent | 768da57fe4aeb9fddc96620d5a91d5a2974e438d (diff) | |
Merge pull request #8065 from bbodenmiller/patch-17
[7.4 rc fix] [doc] clarify when database.yml needs to be updated
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/7.3-to-7.4.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/7.3-to-7.4.md b/doc/update/7.3-to-7.4.md index 89f5cfe9649..c1a70ba4e60 100644 --- a/doc/update/7.3-to-7.4.md +++ b/doc/update/7.3-to-7.4.md @@ -97,7 +97,7 @@ sudo -u git -H editor config/unicorn.rb * HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/lib/support/nginx/gitlab-ssl but with your setting -#### Update database.yml config file(for mysql only) if needed (basically it is required for old gitlab installations) +#### MySQL Databases: Update database.yml config file * Add `collation: utf8_general_ci` to config/database.yml as seen in [config/database.yml.mysql](config/database.yml.mysql) |