From: feld <feld@feld.me>
Date: Tue, 27 Oct 2020 17:42:24 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/autofollowing'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e062329a177e1a1382cb3a44ef71e6d278b4963e;p=akkoma

Merge branch 'develop' into 'feature/autofollowing'

# Conflicts:
#   CHANGELOG.md
---

e062329a177e1a1382cb3a44ef71e6d278b4963e
diff --cc CHANGELOG.md
index fd5b9034d,afeaa930b..ced8a2d5f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -9,7 -9,9 +9,11 @@@ The format is based on [Keep a Changelo
  - Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
  - Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
  - Mix task option for force-unfollowing relays
- - Setting `:instance, autofollowing_nicknames` to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
+ - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
+ - Pleroma API: Importing the mutes users from CSV files.
+ - Experimental websocket-based federation between Pleroma instances.
++- Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
++
  
  ### Changed
  
diff --cc config/description.exs
index 79e1368d0,0da1da57d..1c300cc45
--- a/config/description.exs
+++ b/config/description.exs
@@@ -829,20 -829,8 +829,14 @@@ config :pleroma, :config_description, 
          key: :autofollowed_nicknames,
          type: {:list, :string},
          description:
-           "Set to nicknames of (local) users that every new user should automatically follow",
-         suggestions: [
-           "lain",
-           "kaniini",
-           "lanodan",
-           "rinpatch"
-         ]
+           "Set to nicknames of (local) users that every new user should automatically follow"
        },
 +      %{
 +        key: :autofollowing_nicknames,
 +        type: {:list, :string},
 +        description:
 +          "Set to nicknames of (local) users that automatically follows every newly registered user"
 +      },
        %{
          key: :attachment_links,
          type: :boolean,