Merge branch 'develop' into global-status-expiration

diff --cc CHANGELOG.md
index a0173351f5a51497af198e7500f43458600f9956,e454bd9d106f493e5de6350884c856c474acf768..cf750637a48ddbc29c14aeee2e10590cb1ca5af4
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -21,10 -24,18 +24,21 @@@ The format is based on [Keep a Changelo
  ### Fixed
  - Support pagination in conversations API
  
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
  ## [unreleased-patch]
+ ### Fixed
+ - Logger configuration through AdminFE
+ - HTTP Basic Authentication permissions issue
+ - ObjectAgePolicy didn't filter out old messages
+ 
+ ### Added
+ - NodeInfo: ObjectAgePolicy settings to the `federation` list.
+ <details>
+   <summary>API Changes</summary>
+ - Admin API: `GET /api/pleroma/admin/need_reboot`.
+ </details>
  
  ## [2.0.2] - 2020-04-08
  ### Added

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/common_api/activity_draft.ex
Simple merge

diff --cc lib/pleroma/web/common_api/common_api.ex
index 7a8ccf3e54e28194c9bef4a0c309c80e1665902d,f50a909aade322b95423e5a646af90b2ce8a63ee..54be69ee5c51b42dde2a8984de296a9e3488e29d
--- 1/lib/pleroma/web/common_api/common_api.ex
--- 2/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@@ -322,26 -324,14 +322,6 @@@ defmodule Pleroma.Web.CommonAPI d
      end
    end
  
-   # Updates the emojis for a user based on their profile
-   def update(user) do
-     emoji = emoji_from_profile(user)
-     source_data = Map.put(user.source_data, "tag", emoji)
- 
-     user =
-       case User.update_source_data(user, source_data) do
-         {:ok, user} -> user
-         _ -> user
-       end
- 
-     ActivityPub.update(%{
-       local: true,
-       to: [Pleroma.Constants.as_public(), user.follower_address],
-       cc: [],
-       actor: user.ap_id,
-       object: Pleroma.Web.ActivityPub.UserView.render("user.json", %{user: user})
-     })
 -  defp maybe_create_activity_expiration({:ok, activity}, %NaiveDateTime{} = expires_at) do
 -    with {:ok, _} <- ActivityExpiration.create(activity, expires_at) do
 -      {:ok, activity}
 -    end
--  end
 -
 -  defp maybe_create_activity_expiration(result, _), do: result
--
    def pin(id_or_ap_id, %{ap_id: user_ap_id} = user) do
      with %Activity{
             actor: ^user_ap_id,

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge