Age | Commit message (Collapse) | Author |
|
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fix pleroma.user toggle_activated to work not only on local users.
|
|
|
|
|
|
toggle_activated
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
to allow for SSL debugging)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
user (e.g. followbots)
|
|
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
|
|
|
|
|
|
|
|
|
|
third-party clones like wasabi
|
|
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
|
|
Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate.
|