diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-26 22:23:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-26 22:23:05 +0300 |
| commit | 4134abef63e1165f5701741c1012e64cb908654c (patch) | |
| tree | bf531d2f464297c46edeaaf02e6966c1695934a5 /config | |
| parent | cbb19d0e1882f5ce641f30b51d7156336f81aba9 (diff) | |
| parent | e4f1d8f48c85b8a388d6c3945db157de5ce588c5 (diff) | |
| download | pleroma-4134abef63e1165f5701741c1012e64cb908654c.tar.gz pleroma-4134abef63e1165f5701741c1012e64cb908654c.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 3ccb6a3f5..d6d116314 100644 --- a/config/config.exs +++ b/config/config.exs @@ -47,7 +47,6 @@ use Mix.Config config :pleroma, ecto_repos: [Pleroma.Repo] config :pleroma, Pleroma.Repo, - types: Pleroma.PostgresTypes, telemetry_event: [Pleroma.Repo.Instrumenter], migration_lock: nil diff --git a/config/test.exs b/config/test.exs index 2a20a03e7..a85881592 100644 --- a/config/test.exs +++ b/config/test.exs @@ -47,7 +47,10 @@ config :pleroma, Pleroma.Repo, password: "postgres", database: "pleroma_test", hostname: System.get_env("DB_HOST") || "localhost", - pool: Ecto.Adapters.SQL.Sandbox + pool: Ecto.Adapters.SQL.Sandbox, + pool_size: 50 + +config :pleroma, :dangerzone, override_repo_pool_size: true # Reduce hash rounds for testing config :pbkdf2_elixir, rounds: 1 @@ -121,6 +124,16 @@ config :tzdata, :autoupdate, :disabled config :pleroma, :mrf, policies: [] +config :pleroma, :pipeline, + object_validator: Pleroma.Web.ActivityPub.ObjectValidatorMock, + mrf: Pleroma.Web.ActivityPub.MRFMock, + activity_pub: Pleroma.Web.ActivityPub.ActivityPubMock, + side_effects: Pleroma.Web.ActivityPub.SideEffectsMock, + federator: Pleroma.Web.FederatorMock, + config: Pleroma.ConfigMock + +config :pleroma, :cachex, provider: Pleroma.CachexMock + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |