Age | Commit message (Collapse) | Author |
|
This is how upstream does it by default.
|
|
|
|
|
|
|
|
|
|
|
|
branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
|
sixohsix/pleroma-post_expiration
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This way, if your test.secret.exs has an error, you'll actually see it.
|
|
|
|
|
|
|
|
added rate limit to password reset
configure rate limit in runtime
|
|
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
|
|
|
|
async/await to execute status and account search in parallel
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
agent in tests
|
|
|
|
|
|
|
|
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
|