From: lain <lain@soykaf.club>
Date: Fri, 30 Nov 2018 16:31:05 +0000 (+0100)
Subject: Fix transmogrifier test.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8f1fffebc6796f2e0758a99d032ab3db7f2f6e0b;p=akkoma

Fix transmogrifier test.
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 2d11c40c5..17b063609 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -447,7 +447,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       update_data =
         new_user_data
         |> Map.take([:name, :bio, :avatar])
-        |> Map.put(:info, Map.merge(actor.info, %{"banner" => banner, "locked" => locked}))
+        |> Map.put(:info, %{"banner" => banner, "locked" => locked})
 
       actor
       |> User.upgrade_changeset(update_data)