Merge remote-tracking branch 'origin/develop' into feature/account-export

2020-10-20 17:27:29 +04:00 · 2020-10-20 17:27:29 +04:00 · e87901c424
commit e87901c424
parent ad605e3e16 44b2a137d1
30 changed files with 226 additions and 41 deletions
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@ -164,7 +164,7 @@ defmodule Pleroma.User.Search do
  end

  defp filter_discoverable_users(query) do
-    from(q in query, where: q.discoverable == true)
+    from(q in query, where: q.is_discoverable == true)
  end

  defp filter_internal_users(query) do