aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2018-10-30 12:17:48 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2018-10-30 12:17:48 +0000
commit639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3 (patch)
treedacb3cc1ca99b001b4bb6450b2a0caa1624086eb /guides
parent5431e17733366da1fd10f2cd3039d66a56012683 (diff)
downloadrails-639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3.tar.gz
rails-639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3.tar.bz2
rails-639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3.zip
Restore `encoding: utf8mb4` in database.yml
rails/rails#33853 and rails/rails#33929 removed `encoding: utf8mb4` from database.yml since at that time MySQL 5.1 is supported with the master branch. Since MySQL 5.1 has been dropped, we can restore `encoding: utf8mb4` in database.yml
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 61bb35cf93..d03943ba4a 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -1011,6 +1011,7 @@ If you choose to use MySQL or MariaDB instead of the shipped SQLite3 database, y
```yaml
development:
adapter: mysql2
+ encoding: utf8mb4
database: blog_development
pool: 5
username: root