aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-10-30 22:12:45 +0900
committerGitHub <noreply@github.com>2018-10-30 22:12:45 +0900
commit405aef3dede8938c8eb9789f6d6722864faddb09 (patch)
tree0a1ed78d2db9224621a33a55689af308babb673c /guides
parent9ae3ddbb21ece10550c8fd37e0c12bab9f5a89f8 (diff)
parent639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3 (diff)
downloadrails-405aef3dede8938c8eb9789f6d6722864faddb09.tar.gz
rails-405aef3dede8938c8eb9789f6d6722864faddb09.tar.bz2
rails-405aef3dede8938c8eb9789f6d6722864faddb09.zip
Merge pull request #34349 from yahonda/restore_encoding_utf8mb4
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