From: lain <lain@soykaf.club>
Date: Mon, 27 Jul 2020 16:35:47 +0000 (+0000)
Subject: Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=e1a1c8e7de5e10fa64d168dc5d35a80b96767395;p=akkoma

Merge branch 'develop' into 'cleanup/masto_fe-default_settings'

# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex
---

e1a1c8e7de5e10fa64d168dc5d35a80b96767395
diff --cc lib/pleroma/web/views/masto_fe_view.ex
index 3b78629dc,f739dacb6..b1669d198
--- a/lib/pleroma/web/views/masto_fe_view.ex
+++ b/lib/pleroma/web/views/masto_fe_view.ex
@@@ -56,7 -86,7 +56,7 @@@ defmodule Pleroma.Web.MastoFEView d
            "video\/mp4"
          ]
        },
-       settings: user.settings || %{},
 -      settings: user.mastofe_settings || @default_settings,
++      settings: user.mastofe_settings || %{},
        push_subscription: nil,
        accounts: %{user.id => render(AccountView, "show.json", user: user, for: user)},
        custom_emojis: render(CustomEmojiView, "index.json", custom_emojis: custom_emojis),