From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 17 Sep 2019 18:20:08 +0000 (+0300)
Subject: Merge branch 'develop' into issue/733
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7dd51652f96db8479fb3848c3a993b74b7246d27;p=akkoma

Merge branch 'develop' into issue/733
---

7dd51652f96db8479fb3848c3a993b74b7246d27
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
index 2fbb16623,8461b666e..9f6d8b658
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@@ -1062,12 -1062,6 +1062,12 @@@ defmodule Pleroma.Web.ActivityPub.Trans
      end
    end
  
 +  defp upgrade_user(user, data) do
 +    user
-     |> User.upgrade_changeset(data)
++    |> User.upgrade_changeset(data, true)
 +    |> User.update_and_set_cache()
 +  end
 +
    def maybe_retire_websub(ap_id) do
      # some sanity checks
      if is_binary(ap_id) && String.length(ap_id) > 8 do