Merge branch 'develop' into feature/bulk-confirmation

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/mix/tasks/pleroma/user.ex
Simple merge

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

diff --cc lib/pleroma/user/query.ex
index 64bb24c0e14ac2f2b3cd1c47c5d2fd0659e7e875,193b90d9d65e077d0b20d789afd843f62ff85758..2440bf890c1adf275b7341019f0e4738eb0bca46
--- 1/lib/pleroma/user/query.ex
--- 2/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@@ -145,13 -146,8 +146,12 @@@ defmodule Pleroma.User.Query d
  
    defp compose_query({:deactivated, true}, query) do
      where(query, [u], u.deactivated == ^true)
-     |> where([u], not is_nil(u.nickname))
    end
  
 +  defp compose_query({:confirmation_pending, bool}, query) do
 +    where(query, [u], u.confirmation_pending == ^bool)
 +  end
 +
    defp compose_query({:need_approval, _}, query) do
      where(query, [u], u.approval_pending)
    end