diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-18 14:36:40 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-18 14:36:40 +0000 |
| commit | ad3181895c2ce14191ca4ada0d86346947428610 (patch) | |
| tree | 34190b6fa74e3a7a34a02b6dd7fe1ee464bdd988 /config | |
| parent | 6098070234f7d84a32cc918d709efd07520e0b99 (diff) | |
| parent | 595d855f0ebd88faede51bf3e08384e956465722 (diff) | |
| download | pleroma-ad3181895c2ce14191ca4ada0d86346947428610.tar.gz pleroma-ad3181895c2ce14191ca4ada0d86346947428610.zip | |
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 320296991..e5f0b4f6f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -24,7 +24,23 @@ config :pleroma, Pleroma.Uploaders.S3, config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] -config :pleroma, :uri_schemes, additionnal_schemes: [] +config :pleroma, :uri_schemes, + valid_schemes: [ + "https", + "http", + "dat", + "dweb", + "gopher", + "ipfs", + "ipns", + "irc", + "ircs", + "magnet", + "mailto", + "mumble", + "ssb", + "xmpp" + ] # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, |