diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-03 15:03:50 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-03 15:03:50 +0000 |
| commit | 127e7b8ff9e5e7e1d26b6f7d80985f8144644ee5 (patch) | |
| tree | 8cb3efaeb2cbfebcddc79bcc2cdef2c480ad6453 /config | |
| parent | da0ef154a6ea87abbe81a094c444546a3e62c723 (diff) | |
| parent | 8407e26b0c1ec315fe8864948c78657f29f370c7 (diff) | |
| download | pleroma-127e7b8ff9e5e7e1d26b6f7d80985f8144644ee5.tar.gz pleroma-127e7b8ff9e5e7e1d26b6f7d80985f8144644ee5.zip | |
Merge branch 'feature/1469-webfinger-expanding' into 'develop'
Feature/1469 webfinger expanding
Closes #1469 and #2517
See merge request pleroma/pleroma!3361
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 4e21ce457..a84b15a37 100644 --- a/config/config.exs +++ b/config/config.exs @@ -869,6 +869,8 @@ config :pleroma, ConcurrentLimiter, [ {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]} ] +config :pleroma, Pleroma.Web.WebFinger, domain: nil, update_nickname_on_user_fetch: true + # 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" diff --git a/config/test.exs b/config/test.exs index d5c25f65e..f5eb6e5c2 100644 --- a/config/test.exs +++ b/config/test.exs @@ -129,6 +129,8 @@ config :pleroma, :pipeline, config :pleroma, :cachex, provider: Pleroma.CachexMock +config :pleroma, Pleroma.Web.WebFinger, update_nickname_on_user_fetch: false + config :pleroma, :side_effects, ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock, logger: Pleroma.LoggerMock |