diff options
| author | lambda <lain@soykaf.club> | 2019-05-17 10:21:38 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-17 10:21:38 +0000 |
| commit | e5b34f5e0544371603bc2b570c26ede3182c2f8b (patch) | |
| tree | 9316257b96ae753f3ff43166068805354bc223e3 /config | |
| parent | 0498fa244f011e53d3a78eb1b0213c3ca43d4afa (diff) | |
| parent | 249b31ffe53115ad187235890c405138ba190e14 (diff) | |
| download | pleroma-e5b34f5e0544371603bc2b570c26ede3182c2f8b.tar.gz pleroma-e5b34f5e0544371603bc2b570c26ede3182c2f8b.zip | |
Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 9cbac35eb..61e2648a9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -48,7 +48,8 @@ config :pleroma, ecto_repos: [Pleroma.Repo] config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes, - telemetry_event: [Pleroma.Repo.Instrumenter] + telemetry_event: [Pleroma.Repo.Instrumenter], + migration_lock: nil config :pleroma, Pleroma.Captcha, enabled: false, |