Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
|
# 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.
|
|
|