Merge remote-tracking branch 'pleroma/develop' into cycles-base-url

This commit is contained in:
Alex Gleason 2021-05-31 16:49:46 -05:00
commit f2134e605b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
186 changed files with 5816 additions and 1315 deletions

View file

@ -103,9 +103,7 @@ defmodule Pleroma.Application do
task_children(@mix_env) ++
dont_run_in_test(@mix_env) ++
chat_child(chat_enabled?()) ++
[
Pleroma.Gopher.Server
]
[Pleroma.Gopher.Server]
# See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
# for other strategies and supported options
@ -230,6 +228,12 @@ defmodule Pleroma.Application do
keys: :duplicate,
partitions: System.schedulers_online()
]}
] ++ background_migrators()
end
defp background_migrators do
[
Pleroma.Migrators.HashtagsTableMigrator
]
end