diff options
| author | lain <lain@soykaf.club> | 2020-08-09 10:53:58 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-09 10:53:58 +0000 |
| commit | d0fc48ea67d90bf01bd546088b114362592d5eb0 (patch) | |
| tree | c4c56684cbe680fc0c024e028618dc291520bd74 /config | |
| parent | cb376c4c4ca6491f2b58a9a916986998312640f5 (diff) | |
| parent | ad29a4f2cf4496aaa9463e11d94b35364e9cddae (diff) | |
| download | pleroma-d0fc48ea67d90bf01bd546088b114362592d5eb0.tar.gz | |
Merge branch 'develop' into 'feat/floki-fast-html-2'
# Conflicts:
# config/config.exs
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 78f3232e6..eb85a6ed4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -515,7 +515,13 @@ config :pleroma, Pleroma.User, "user-search", "user_exists", "users", - "web" + "web", + "verify_credentials", + "update_credentials", + "relationships", + "search", + "confirmation_resend", + "mfa" ], email_blacklist: [] @@ -739,6 +745,8 @@ config :pleroma, :instances_favicons, enabled: false config :floki, :html_parser, Floki.HTMLParser.FastHtml +config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator + # 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" |