Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
index c7c8524dd95d7b328c8d1f166b0765fc12f93adc,ebe1f11c4a1e5261ff76ee4a1e6cd729a7095096..c509109115b79564f6f1a057776d261d00014f1e
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -12,36 -12,6 +12,40 @@@ websocket_config = 
    compress: false
  ]
  
-     description: "Name of the installed Admin frontend"
 +frontend_options = [
 +  %{
 +    key: "name",
++    label: "Name",
 +    type: :string,
-     description: "reference of the installed Admin frontend to be used"
++    description:
++      "Name of the frontend. Valid config must include both `Name` and `Reference` values."
 +  },
 +  %{
 +    key: "ref",
++    label: "Reference",
 +    type: :string,
++    description:
++      "Reference of the frontend to be used. Valid config must include both `Name` and `Reference` values."
 +  },
 +  %{
 +    key: "git",
 +    type: :string,
 +    description: "URL of the git repository of the frontend"
 +  },
 +  %{
 +    key: "build_url",
 +    type: :string,
 +    description:
 +      "Either an url to a zip file containing the frontend or a template to build it by inserting the `ref`. The string `${ref}` will be replaced by the configured `ref`.",
 +    example: "https://some.url/builds/${ref}.zip"
 +  },
 +  %{
 +    key: "build_dir",
 +    type: :string,
 +    description: "The directory inside the zip file "
 +  }
 +]
 +
  config :pleroma, :config_description, [
    %{
      group: :pleroma,
@@@ -3582,18 -3553,41 +3587,41 @@@
          key: :primary,
          type: :map,
          description: "Primary frontend, the one that is served for all pages by default",
-         description: "A map containing available frontends and parameters for their installation."
 +        children: frontend_options
 +      },
 +      %{
 +        key: :admin,
 +        type: :map,
 +        description: "Admin frontend",
 +        children: frontend_options
 +      },
 +      %{
 +        key: :available,
 +        type: :map,
 -          %{
 -            key: "name",
 -            label: "Name",
 -            type: :string,
 -            description:
 -              "Name of the installed primary frontend. Valid config must include both `Name` and `Reference` values."
 -          },
 -          %{
 -            key: "ref",
 -            label: "Reference",
 -            type: :string,
 -            description:
 -              "Reference of the installed primary frontend to be used. Valid config must include both `Name` and `Reference` values."
 -          }
++        description:
++          "A map containing available frontends and parameters for their installation.",
+         children: [
++          frontend_options
+         ]
+       }
+     ]
+   },
+   %{
+     group: :pleroma,
+     key: Pleroma.Web.Preload,
+     type: :group,
+     description: "Preload-related settings",
+     children: [
+       %{
+         key: :providers,
+         type: {:list, :module},
+         description: "List of preload providers to enable",
+         suggestions: [
+           Pleroma.Web.Preload.Providers.Instance,
+           Pleroma.Web.Preload.Providers.User,
+           Pleroma.Web.Preload.Providers.Timelines,
+           Pleroma.Web.Preload.Providers.StatusNet
+         ]
        }
      ]
    }

diff --cc docs/configuration/cheatsheet.md
Simple merge