diff options
| author | lain <lain@soykaf.club> | 2020-07-08 13:21:58 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-08 13:21:58 +0200 |
| commit | cdc153db31a466063db85cfa4b73f3e174653b89 (patch) | |
| tree | f5aa068895c95349381a1896857fa8fd1cb83f2c /config | |
| parent | e341f817850e51a29ec45607563323b6660f8da4 (diff) | |
| parent | 6335b32aa8f5c54cf5f09638189a77cad5785077 (diff) | |
| download | pleroma-cdc153db31a466063db85cfa4b73f3e174653b89.tar.gz pleroma-cdc153db31a466063db85cfa4b73f3e174653b89.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index d28a359b2..458d3a99a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -97,6 +97,7 @@ config :pleroma, :uri_schemes, "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -437,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, diff --git a/config/description.exs b/config/description.exs index 370af80a6..705ba83d0 100644 --- a/config/description.exs +++ b/config/description.exs @@ -498,6 +498,7 @@ config :pleroma, :config_description, [ "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -699,8 +700,9 @@ config :pleroma, :config_description, [ key: :public, type: :boolean, description: - "Makes the client API in authentificated mode-only except for user-profiles." <> - " Useful for disabling the Local Timeline and The Whole Known Network." + "Makes the client API in authenticated mode-only except for user-profiles." <> + " Useful for disabling the Local Timeline and The Whole Known Network. " <> + " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting." }, %{ key: :quarantined_instances, |