diff options
| author | feld <feld@feld.me> | 2020-01-22 17:13:17 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-22 17:13:17 +0000 |
| commit | be2777715650d0ac80509f0bd22b4cea8641f9b3 (patch) | |
| tree | d0ed95ecf37bb2067ac00832c28148e3edf94f5c /config/config.exs | |
| parent | 15db18af691f91ae7c834aa65f4b4d11d1c32d4c (diff) | |
| parent | f3e074e949ce603446728b02ea059efe2a05a841 (diff) | |
| download | pleroma-be2777715650d0ac80509f0bd22b4cea8641f9b3.tar.gz pleroma-be2777715650d0ac80509f0bd22b4cea8641f9b3.zip | |
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 9be1c721f..2c154eb45 100644 --- a/config/config.exs +++ b/config/config.exs @@ -112,7 +112,6 @@ config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], groups: [ - # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Custom: ["/emoji/*.png", "/emoji/**/*.png"] ], default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json", @@ -265,7 +264,6 @@ config :pleroma, :instance, remote_post_retention_days: 90, skip_thread_containment: true, limit_to_local_content: :unauthenticated, - dynamic_configuration: false, user_bio_length: 5000, user_name_length: 100, max_account_fields: 10, @@ -620,6 +618,8 @@ config :pleroma, :web_cache_ttl, config :pleroma, :modules, runtime_dir: "instance/modules" +config :pleroma, configurable_from_database: false + config :swarm, node_blacklist: [~r/myhtml_.*$/] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |