diff options
| author | feld <feld@feld.me> | 2024-01-23 00:16:55 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-01-23 00:16:55 +0000 |
| commit | 626c22961f7eb0bfc8735a11ef005e5b991f75ce (patch) | |
| tree | b2239df327a7479f5cd2914643298380a3e0bf20 /config | |
| parent | f7b3681eb0801c8ebb8a3048d29c12e725582f19 (diff) | |
| parent | 3a8594e92759aa10d3e6ad5b4a1892beb6d74cc9 (diff) | |
| download | pleroma-626c22961f7eb0bfc8735a11ef005e5b991f75ce.tar.gz pleroma-626c22961f7eb0bfc8735a11ef005e5b991f75ce.zip | |
Merge branch 'dialyzer-fixes' into 'develop'
More dialyzer fixes
See merge request pleroma/pleroma!4042
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 7ff3aaa22..bb17ab145 100644 --- a/config/config.exs +++ b/config/config.exs @@ -911,6 +911,8 @@ config :pleroma, Pleroma.Application, max_restarts: 3, streamer_registry: true +config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000 + # 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 28d0364c6..9d752bdf8 100644 --- a/config/test.exs +++ b/config/test.exs @@ -170,6 +170,10 @@ config :pleroma, Pleroma.Application, streamer_registry: false, test_http_pools: true +config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000 + +config :pleroma, Pleroma.Emoji.Loader, test_emoji: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |