From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 2 Mar 2020 20:29:51 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4f3313bf80ad126e1f5bc95282793d6e101318d8;p=akkoma

Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
---

4f3313bf80ad126e1f5bc95282793d6e101318d8
diff --cc CHANGELOG.md
index d05837016,c8f3794a3..462c7c2a3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,7 -38,7 +38,8 @@@ The format is based on [Keep a Changelo
  - Rate limiter is now disabled for localhost/socket (unless remoteip plug is enabled)
  - Logger: default log level changed from `warn` to `info`.
  - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
 +- Allow account registration without an email
+ - Default to `prepare: :unnamed` in the database configuration.
  <details>
    <summary>API Changes</summary>