Merge branch 'fix/extended-nickname-format-default-config' into 'develop'

Add missing extended_nickname_format setting to the default config

See merge request pleroma/pleroma!1776

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ebc46b7d94b01cbbffb8cf0da8b5e2a3b99264a..d2f945004a0059acb403ad8e580b2c46459a84dd 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
 - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
+- Added `:instance, extended_nickname_format` setting to the default config
 
 ## [1.1.0] - 2019-??-??
 ### Security

diff --git a/config/config.exs b/config/config.exs
index 36bea19a089a51d035c696d2446ba8cf24e426df..ddbfb246a32db789d33caecaeab04fc820b896e9 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -279,7 +279,8 @@ config :pleroma, :instance,
   max_remote_account_fields: 20,
   account_field_name_length: 512,
   account_field_value_length: 2048,
-  external_user_synchronization: true
+  external_user_synchronization: true,
+  extended_nickname_format: false
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because