diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-10 11:34:53 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-10 11:34:53 -0500 |
| commit | 3c0c1fd2efa981f18091782434c1f0ac77462b8e (patch) | |
| tree | 7776233f9248d4e1caee6ad859af3a524347d926 /config/config.exs | |
| parent | d7a37fddd1fc5169ae8c714d0baf8e5372a5f1d5 (diff) | |
| parent | ce9514000db1e08a69b8874f21e66261b9261d86 (diff) | |
| download | pleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.tar.gz pleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.zip | |
Merge branch 'develop' into issue/1790-updated-oban
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c5dc03650..6fc84efc2 100644 --- a/config/config.exs +++ b/config/config.exs @@ -97,6 +97,7 @@ config :pleroma, :uri_schemes, "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -188,6 +189,7 @@ config :pleroma, :instance, background_image: "/images/city.jpg", instance_thumbnail: "/instance/thumbnail.jpeg", limit: 5_000, + description_limit: 5_000, chat_limit: 5_000, remote_limit: 100_000, upload_limit: 16_000_000, @@ -436,8 +438,7 @@ config :pleroma, Pleroma.Web.Metadata, config :pleroma, Pleroma.Web.Preload, providers: [ - Pleroma.Web.Preload.Providers.Instance, - Pleroma.Web.Preload.Providers.StatusNet + Pleroma.Web.Preload.Providers.Instance ] config :pleroma, :http_security, @@ -704,6 +705,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata config :ex_aws, http_client: Pleroma.HTTP.ExAws +config :pleroma, :instances_favicons, enabled: false + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |