Merge branch 'develop' into refactor/deactivated_user_field
This commit is contained in:
commit
537ba1c5e0
48 changed files with 1066 additions and 214 deletions
|
|
@ -139,6 +139,7 @@ defmodule Pleroma.User.Query do
|
|||
defp compose_query({:active, _}, query) do
|
||||
where(query, [u], u.is_active == true)
|
||||
|> where([u], u.is_approved == true)
|
||||
|> where([u], u.is_confirmed == true)
|
||||
end
|
||||
|
||||
defp compose_query({:legacy_active, _}, query) do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue