Merge remote-tracking branch 'upstream/develop' into registration-workflow

2020-11-21 10:23:53 -06:00 · 2020-11-21 10:23:53 -06:00 · 30ed7b502f
commit 30ed7b502f
parent 9546c1444c ecd1ef8cb5
288 changed files with 3775 additions and 3624 deletions
--- a/lib/pleroma/emails/admin_email.ex
+++ b/lib/pleroma/emails/admin_email.ex
@ -48,6 +48,9 @@ defmodule Pleroma.Emails.AdminEmail do
              status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id)
              "<li><a href=\"#{status_url}\">#{status_url}</li>"

+            %{"id" => id} when is_binary(id) ->
+              "<li><a href=\"#{id}\">#{id}</li>"
+
            id when is_binary(id) ->
              "<li><a href=\"#{id}\">#{id}</li>"
          end)