summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-08CHANGELOG.md: Split settings renaming to 2 separate entriesrinpatch
2020-09-08ForceBotUnlistedPolicy: simplify codeAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: try to fix test 2Alibek Omarov
2020-09-07ForceBotUnlistedPolicy: try to fix testAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: fix test extensionAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: formatAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: add testAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: initial add, tiny clean up from my previous versionAlibek Omarov
2020-09-07changelog entryAlexander Strizhakov
2020-09-07deprecation warningsAlexander Strizhakov
2020-09-07passing adapter options directly without adapter keyAlexander Strizhakov
2020-09-07migrations for renaming gun timeout optionsAlexander Strizhakov
2020-09-07adapter options unificationAlexander Strizhakov
not needed options deletion
2020-09-07Merge branch 'feature/1790-oban-overuse' into 'develop'rinpatch
removing StatsWorker from Oban cron jobs See merge request pleroma/pleroma!2963
2020-09-07CHANGELOG.md: move Unreleased section ahead of unreleased-patchrinpatch
2020-09-07removing Stats worker from Oban cron jobsAlexander Strizhakov
2020-09-07Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-07Merge branch 'chore/back-to-upstream-tesla' into 'develop'rinpatch
switch back to upstream tesla See merge request pleroma/pleroma!2966
2020-09-07switch back to upstream teslarinpatch
The patch we required got merged upstream: https://github.com/teamon/tesla/commit/9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30
2020-09-07Add a changelog entry for hackney downgraderinpatch
2020-09-07Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949
2020-09-07Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-07Merge branch 'fix/no-rich-media-error' into 'develop'Haelwenn
RichMedia: do not log webpages missing metadata as errors See merge request pleroma/pleroma!2960
2020-09-07Merge branch 'chore/add-cc-by-4' into 'develop'Haelwenn
Add a copy of CC-BY-4.0 to the repo See merge request pleroma/pleroma!2962
2020-09-07instance: Log catch favicon errors as warningsHaelwenn (lanodan) Monnier
2020-09-07added api specMaksim Pechnikov
2020-09-06added import mutesMaksim Pechnikov
2020-09-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
media-preview-proxy
2020-09-06[#2497] Fixed MediaProxyWarmingPolicyTest.Ivan Tashkinov
2020-09-06Add a copy of CC-BY-4.0 to the reporinpatch
We mentined it in COPYING, but didn't actually have a copy in the repo.
2020-09-05RichMedia: do not log webpages missing metadata as errorsrinpatch
Also fixes the return value of Parser.parse on errors, previously was just `:ok` due to the logger call in the end
2020-09-05Merge branch 'hotfix-the-hotfix' into 'develop'rinpatch
ConnectionPool: fix the previous hotfix See merge request pleroma/pleroma!2959
2020-09-05ConnectionPool middleware: handle connection opening errorsrinpatch
2020-09-05ConnectionPool: fix the previous hotfixrinpatch
I rushed the hotfix and forgot how `pop_in` actually works, I want to die. We need some integration tests for the HTTP client
2020-09-05Merge branch 'hotfix/tesla-env-no-access' into 'develop'rinpatch
ConnectionPool middleware: fix a crash due to unimplemented behaviour See merge request pleroma/pleroma!2958
2020-09-05ConnectionPool middleware: fix a crash due to unimplemented behaviourrinpatch
Structs don't implement Access behaviour, so this crashed. Tests didn't catch it and I didn't test that part of the codepath. Very sorry
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
Closes #1987
2020-09-05Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'rinpatch
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects See merge request pleroma/pleroma!2954
2020-09-05[#2497] Func defs grouping fix.Ivan Tashkinov
2020-09-05[#2497] Adjusted media proxy preview invalidation. Allowed client-side ↵Ivan Tashkinov
caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. Removed :preview pool in favor of existing :media one. Misc. refactoring.
2020-09-05[#2497] Made media preview proxy fall back to media proxy instead of to ↵Ivan Tashkinov
source url. Adjusted tests. Refactoring.
2020-09-05use override flag for hackney dependencyAlexander Strizhakov
2020-09-05Prevent AccountView and instance.get_or_update_favicon failsHaelwenn (lanodan) Monnier
2020-09-05Merge branch 'use-https-in-dockerfile' into 'develop'Haelwenn
Use TLS when adding Alpine community repository in Dockerfile See merge request pleroma/pleroma!2955
2020-09-04Use TLS when adding Alpine community repository in DockerfileJames Alseth
2020-09-04ConnectionPool middleware: Fix connection leak on ReverseProxy redirectsrinpatch
Requires a patched Tesla due to upstream not saving opts between redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-04Added cmakeFarhan Khan
2020-09-04fix for ReverseProxyAlexander Strizhakov
2020-09-04temp hackney fixAlexander Strizhakov