aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-13Merge branch 'fix/admin-api-docs' into 'develop'kaniini
Fix admin api docs for creating users See merge request pleroma/pleroma!1660
2019-09-13Fix admin api docs for creating usersAngelina Filippova
2019-09-12Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn
Fix double quotes in error logs See merge request pleroma/pleroma!1656
2019-09-12Fix associated test as wellMark Felder
2019-09-11Fix double quotes in error logsMark Felder
Example: pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
2019-09-11Merge branch 'feature/jason-view-render' into 'develop'kaniini
Use Jason for rendering responses See merge request pleroma/pleroma!1655
2019-09-11Use Jason for rendering responsesrinpatch
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)
2019-09-11Merge branch 'patch-5' into 'develop'Haelwenn
Mastodon API: URI encode hashtag name in generated URLs See merge request pleroma/pleroma!1642
2019-09-11Merge branch 'fix/oom-parallel-rendering' into 'develop'lain
Revert "Parallelize template rendering" See merge request pleroma/pleroma!1654
2019-09-11Add extended benchmarkrinpatch
2019-09-11web_cache_ttl descriptionAlex S
2019-09-11refactoringAlex S
2019-09-11little refactorAlex S
2019-09-11some changesAlex S
2019-09-11placeholder for config.mdAlex S
2019-09-11little fixAlex S
2019-09-11bump ex_doc versionAlex S
2019-09-11formattingAlex S
2019-09-11don't add behaviour to suggestionsAlex S
2019-09-11Apply suggestion to config/description.exsAlexander Strizhakov
2019-09-11Apply suggestion to config/description.exsAlexander Strizhakov
2019-09-11little fixAlex S
2019-09-11typo fixAlex S
2019-09-11some changesAlex S
2019-09-11fixAlex S
2019-09-11changelogAlex S
2019-09-11expanding regex sigils to use modifiersAlex S
2019-09-11mix docs generates config.mdAlex S
2019-09-11description formattersAlex S
2019-09-11description.exsAlex S
2019-09-11deleting old config.md fileAlex S
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-10Merge branch 'fix/tests' into 'develop'lain
Fix tests for `Activity.all_by_ids_with_object/1` See merge request pleroma/pleroma!1652
2019-09-11Fix `Activity.all_by_ids_with_object/1` testEgor Kislitsyn
2019-09-10Merge branch 'statuses-by-ids' into 'develop'lain
Add an endpoint to get multiple statuses by IDs Closes #1240 See merge request pleroma/pleroma!1621
2019-09-10Add note about limit to the docEgor Kislitsyn
2019-09-10Add an endpoint to get multiple statuses by IDsEgor Kislitsyn
2019-09-09Merge branch 'cache-plug' into 'develop'feld
Add Pleroma.Plugs.Cache Closes #1174 See merge request pleroma/pleroma!1612
2019-09-09Add Pleroma.Plugs.Cacheminibikini
2019-09-09Merge branch 'update-changelog' into 'develop'feld
Update CHANGELOG (add a note about !1649) See merge request pleroma/pleroma!1650
2019-09-10Update CHANGELOG (add a note about !1649)Egor Kislitsyn
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-07Mastodon API: URI encode hashtag name in generated URLsshadowfacts
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
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