Merge branch 'develop' into feature/gen-magic

diff --cc .gitlab-ci.yml
Simple merge

diff --cc CHANGELOG.md
index a5c75bd4fa8931694d0fa30e74b0109270cbac85,8fc1750d181088c9476145faa312b42ae8d3c939..36a84b1a895442822570cce1fe9ce63b510e3ade
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,11 -5,36 +5,37 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
+ ### Added
+ - 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
+ 
  ### Changed
  
 +- **Breaking** Requires `libmagic` (or `file`) to guess file types.
+ - **Breaking:** Pleroma Admin API: emoji packs and files routes changed.
+ - **Breaking:** Sensitive/NSFW statuses no longer disable link previews.
+ - Search: Users are now findable by their urls.
  - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
  - Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
+ - The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
+ - Users with the `discoverable` field set to false will not show up in searches.
+ - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
+ - Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`.
+ 
+ ### Added
+ - 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.
+ 
+ <details>
+   <summary>API Changes</summary>
+ 
+ - Pleroma API: Importing the mutes users from CSV files.
+ - Admin API: Importing emoji from a zip file
+ - Pleroma API: Pagination for remote/local packs and emoji.
+ 
+ </details>
  
  ### Removed
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/installation/alpine_linux_en.md
Simple merge

diff --cc docs/installation/arch_linux_en.md
Simple merge

diff --cc docs/installation/debian_based_en.md
Simple merge

diff --cc docs/installation/debian_based_jp.md
index d98162796dff718c5543dcbebb21e546c53e09c7,764afbe1a4497940d69158ca2f7978e64a7c57ea..94e22325c37414289660fdc41c2109e451342f74
--- 1/docs/installation/debian_based_jp.md
--- 2/docs/installation/debian_based_jp.md
+++ b/docs/installation/debian_based_jp.md
@@@ -34,10 -36,9 +37,9 @@@ sudo apt full-upgrad
  
  * 上記に挙げたパッケージをインストールしておきます。
  ```
- sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-dev
 -sudo apt install git build-essential postgresql postgresql-contrib cmake ffmpeg imagemagick
++sudo apt install git build-essential postgresql postgresql-contrib cmake ffmpeg imagemagick libmagic-dev
  ```
  
- 
  ### ElixirとErlangをインストールします
  
  * Erlangのリポジトリをダウンロードおよびインストールします。

diff --cc docs/installation/gentoo_en.md
Simple merge

diff --cc docs/installation/otp_en.md
index 32f04a9c452970433e86fd61c3f59461844a4087,92584d80dff47c2c95af471143d10e6ee1e7e880..62d4c8a7233723d73ef0ae1a816c8cebc6c00ed3
--- 1/docs/installation/otp_en.md
--- 2/docs/installation/otp_en.md
+++ b/docs/installation/otp_en.md
@@@ -38,9 -37,28 +38,28 @@@ Other than things bundled in the OTP re
  
  === "Debian/Ubuntu"
      ```
 -    apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot
 +    apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot libmagic-dev
      ```
  
+ ### Installing optional packages
+ 
+ Per [`docs/installation/optional/media_graphics_packages.md`](docs/installation/optional/media_graphics_packages.md):
+   * ImageMagick
+   * ffmpeg
+   * exiftool
+ 
+ === "Alpine"
+     ```
+     echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
+     apk update
+     apk add imagemagick ffmpeg exiftool
+     ```
+ 
+ === "Debian/Ubuntu"
+     ```
+     apt install imagemagick ffmpeg libimage-exiftool-perl
+     ```
+ 
  ## Setup
  ### Configuring PostgreSQL
  #### (Optional) Installing RUM indexes

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge