diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 11:59:15 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 21:05:20 +0100 |
| commit | c592a0e58d7207532f2f7be2fff788c9dc695fb5 (patch) | |
| tree | 74477cba37813c549a05d692ae04c135793496a1 /config/test.exs | |
| parent | def088ce520ffac3e200cbf63b049f1d918d2b79 (diff) | |
| parent | f0468697cd74f4ec062f9c6feda53cfbe9e4500c (diff) | |
| download | pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.tar.gz pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.zip | |
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 4 |
1 files changed, 4 insertions, 0 deletions
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 |