From 639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Tue, 30 Oct 2018 12:17:48 +0000
Subject: 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
---
 guides/source/configuring.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'guides/source/configuring.md')

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
-- 
cgit v1.2.3