diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-30 12:12:58 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-30 12:12:58 -0500 |
| commit | 595bca24ad79bf058ea6319f26b1ef643e6b7a10 (patch) | |
| tree | dfeb1e2079e29f909d79d884838135675bf6add9 /config/config.exs | |
| parent | 721c966842c2f9b4f4d6f227ecf3de69d2e66346 (diff) | |
| parent | 5d40ffe429caa21eab33951457bb314677753866 (diff) | |
| download | pleroma-595bca24ad79bf058ea6319f26b1ef643e6b7a10.tar.gz pleroma-595bca24ad79bf058ea6319f26b1ef643e6b7a10.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 66aee3264..d333c618e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -41,7 +41,7 @@ # # This configuration file is loaded before any dependency and # is restricted to this project. -use Mix.Config +import Config # General application configuration config :pleroma, ecto_repos: [Pleroma.Repo] @@ -391,6 +391,11 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_hashtag, + sensitive: ["nsfw"], + reject: [], + federated_timeline_removal: [] + config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :mrf_activity_expiration, days: 365 @@ -404,6 +409,8 @@ config :pleroma, :mrf_object_age, threshold: 604_800, actions: [:delist, :strip_followers] +config :pleroma, :mrf_follow_bot, follower_nickname: nil + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], @@ -654,6 +661,10 @@ config :pleroma, :oauth2, config :pleroma, :database, rum_enabled: false +config :pleroma, :features, improved_hashtag_timeline: :auto + +config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01 + config :pleroma, :env, Mix.env() config :http_signatures, |