Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
|
|
|
1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
|
|
|
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
|
|
This reverts merge request !1653
|
|
|
|
|
|
1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
|
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
|
|
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
moved to helper.
|
|
|
|
branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
|
|
|
sixohsix/pleroma-post_expiration
|
|
|
|
|
|
|
|
|
|
|
|
1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
|
[#1174] Rate limit AP routes
See merge request pleroma/pleroma!1586
|