summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-11Add extended benchmarkrinpatch
2019-09-10Revert "Parallelize template rendering"rinpatch
This reverts commit 1ad71592adb47762287aec8c36d0fca565c38362. Since it had no limit on the number on concurrent processes it OOM killed instances while rendering hellthreads. When I tried introducing a concurrency limit with Task.async_stream/manual folds it lead to about 3 times worse performance on threads larger than 1000 activities (we are talking 30s vs 1.2 minutes), I think this is not worth the about 1.5 times performance increase on smaller threads when using it.
2019-09-09Merge branch 'fix/read-inbox' into 'develop'feld
Fix `ActivityPubController.read_inbox/2` Closes #1248 See merge request pleroma/pleroma!1649
2019-09-10Fix `ActivityPubController.read_inbox/2`Egor Kislitsyn
2019-09-06Merge branch 'chore/query-optimization' into 'develop'kaniini
chore: query optimization Closes #1224 See merge request pleroma/pleroma!1640
2019-09-06activity: when restricting deactivated users, precalculate the user listAriadne Conill
the PostgreSQL query planner is easily confused due to the complexity of certain queries we make. while we plan to simplify these queries through unification of activities and objects, we are not yet there. it has been discovered that using a precalculated list of deactivated users encourages the query planner to prefer simpler indices instead of the activity_visibility index. accordingly, drop the subquery and precalc the user list instead.
2019-09-06activitypub: help ecto build a better query for thread mute filteringAriadne Conill
using an indexed value in thread_mute table helps ecto build a better query.
2019-09-06Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'rinpatch
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog See merge request pleroma/pleroma!1638
2019-09-06Prioritize the removal of TwitterAPI and :accept_blocks in the changelogrinpatch
2019-09-06Merge branch 'so-long-twitterapi' into 'develop'rinpatch
Removing TwitterAPI See merge request pleroma/pleroma!1605
2019-09-06Merge branch 'update-frontend-e75ac9dd' into 'develop'rinpatch
Update frontend bundle to e75ac9dd See merge request pleroma/pleroma!1635
2019-09-06Update frontend bundle to e75ac9ddrinpatch
2019-09-05Merge branch 'hotifx/emoji-trailing' into 'develop'rinpatch
Call TrailingFormatPlug for /api/pleroma/emoji See merge request pleroma/pleroma!1634
2019-09-05Call TrailingFormatPlug for /api/pleroma/emojirinpatch
Apparently Pleroma-FE still calls it with trailing '.json'
2019-09-05Merge branch 'feature/mastoapi-accounts-external' into 'develop'Haelwenn
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id` See merge request pleroma/pleroma!1622
2019-09-05Move checking for restrict_local to User.get_cached_by_id_or_nicknamerinpatch
2019-09-05Merge branch 'fix/endless-poll-handling' into 'develop'rinpatch
Mastodon API Poll view: Fix handling of polls without an end date See merge request pleroma/pleroma!1631
2019-09-05Mastodon API Poll view: Fix handling of polls without an end daterinpatch
2019-09-05Merge branch 'fix/safe-render-notifications' into 'develop'rinpatch
Do not crash if one notification failed to render See merge request pleroma/pleroma!1630
2019-09-05Do not crash if one notification failed to renderrinpatch
2019-09-04Merge branch 'dockerfile-touchups' into 'develop'rinpatch
Update Dockerfile + some touchups to docker.exs See merge request pleroma/pleroma!1624
2019-09-04Switch to alpine:3.9 to avoid dlsym errorsAshlynn Anderson
2019-09-04Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'Haelwenn
Mastodon API: Add `pleroma.thread_muted` to Status entity See merge request pleroma/pleroma!1626
2019-09-04Mastodon API: Add `pleroma.thread_muted` to Status entityrinpatch
Needed for pleroma-fe!941
2019-09-04Merge branch 'feature/mastoapi-read-notifications' into 'develop'Haelwenn
Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities See merge request pleroma/pleroma!1625
2019-09-04Clarify that read notifications are returnedrinpatch
2019-09-04Apply suggestion to docs/api/pleroma_api.mdrinpatch
2019-09-04Apply suggestion to lib/pleroma/notification.exrinpatch
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
as read and make it respond with Mastoapi entities
2019-09-03Mastdon API: Add ability to get a remote account by nickname torinpatch
`/api/v1/accounts/:id`
2019-09-03Switch to official elixir:1.9-alpine image for buildAshlynn Anderson
2019-09-03Remove dynamic config as default, add healthcheckAshlynn Anderson
2019-09-03Merge branch 'feature/pagination-total' into 'develop'rinpatch
Return total items count from pagination + tests See merge request pleroma/pleroma!1620
2019-09-03Return "total" optionallyMaxim Filippov
2019-09-02Return total from pagination + testsMaxim Filippov
2019-08-31credo fixesrinpatch
2019-08-31Add back /api/qvitter/statuses/notifications/read.jsonrinpatch
2019-08-31Remove a useless importrinpatch
2019-08-31Add a changelog entry for twitterapi removal and fix credo issuesrinpatch
2019-08-31Remove TwitterAPI representersrinpatch
2019-08-31Remove Mention of TwitterAPI in readmerinpatch
2019-08-31Remove Activity, User and Notification views from TwitterAPIrinpatch
2019-08-31Remove most of Pleroma.Web.TwitterAPI.TwitterAPIrinpatch
2019-08-30Merge branch 'iss-930-media' into 'develop'feld
Fix missing changes in pleroma/pleroma!1197 See merge request pleroma/pleroma!1613
2019-08-30Fix missing changes in pleroma/pleroma!1197kPherox
2019-08-30Merge branch 'fix/antifollowbot-and-relays' into 'develop'kaniini
Fix AntiFollowbotPolicy when trying to follow a relay Closes #1231 See merge request pleroma/pleroma!1610
2019-08-30Fix AntiFollowbotPolicy when trying to follow a relayfeld
2019-08-28Merge branch 'fix-osada-follow' into 'develop'Haelwenn
Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604
2019-08-27Merge branch 'list-controller' into 'develop'lain
Extract list actions from `MastodonAPIController` into `ListController` See merge request pleroma/pleroma!1600
2019-08-27Merge branch 'tests/activity_pub' into 'develop'lain
added tests for ActivityPub.like\unlike See merge request pleroma/pleroma!1606