From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 14 Oct 2020 20:27:15 +0000 (-0500)
Subject: Merge branch 'develop' into feature/account-export
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1fb9452131721456adf2c19c513e6343f64825a7;p=akkoma

Merge branch 'develop' into feature/account-export
---

1fb9452131721456adf2c19c513e6343f64825a7
diff --cc config/description.exs
index 4942e196d,2a1898922..88f2a6133
--- a/config/description.exs
+++ b/config/description.exs
@@@ -3713,24 -3709,18 +3715,38 @@@ config :pleroma, :config_description, 
        }
      ]
    },
+   %{
+     group: :pleroma,
+     key: :majic_pool,
+     type: :group,
+     description: "Majic/libmagic configuration",
+     children: [
+       %{
+         key: :size,
+         type: :integer,
+         description: "Number of majic workers to start.",
+         suggestions: [2]
+       }
+     ]
++  },
 +  %{
 +    group: :pleroma,
 +    key: Pleroma.Backup,
 +    type: :group,
 +    description: "Account Backup",
 +    children: [
 +      %{
 +        key: :purge_after_days,
 +        type: :integer,
 +        description: "Remove backup achives after N days",
 +        suggestions: [30]
 +      },
 +      %{
 +        key: :limit_days,
 +        type: :integer,
 +        description: "Limit user to export not more often than once per N days",
 +        suggestions: [7]
 +      }
 +    ]
    }
  ]
diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 8b5310d80,bdd3e195d..a4f0d7d34
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@@ -21,10 -20,9 +20,11 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    alias Pleroma.Web.AdminAPI.ModerationLogView
    alias Pleroma.Web.AdminAPI.Search
    alias Pleroma.Web.Endpoint
+   alias Pleroma.Web.Plugs.OAuthScopesPlug
    alias Pleroma.Web.Router
  
 +  require Logger
 +
    @users_page_size 50
  
    plug(