rinpatch [Tue, 8 Sep 2020 17:34:02 +0000 (20:34 +0300)]
Merge branch 'stable' into stable-sync/2.1.1
rinpatch [Mon, 7 Sep 2020 12:06:06 +0000 (15:06 +0300)]
Metadata: Move restriction check from Feed provider to activated_providers
Mark Felder [Tue, 1 Sep 2020 15:43:44 +0000 (10:43 -0500)]
Use :restrict_unauthenticated testing for more granular control
Mark Felder [Mon, 31 Aug 2020 21:11:13 +0000 (16:11 -0500)]
Document breaking change for metadata providers
Mark Felder [Mon, 31 Aug 2020 21:11:01 +0000 (16:11 -0500)]
RelMe and Feed no longer configurable
Mark Felder [Mon, 31 Aug 2020 20:58:21 +0000 (15:58 -0500)]
Do not serve RSS/Atom feeds when instance is private
Mark Felder [Mon, 31 Aug 2020 20:54:22 +0000 (15:54 -0500)]
Fix test so setting doesn't leak
Mark Felder [Mon, 31 Aug 2020 19:48:22 +0000 (14:48 -0500)]
Feed provider only generates a redirect, so always activate it.
Making this configurable is misleading.
Mark Felder [Mon, 31 Aug 2020 19:35:22 +0000 (14:35 -0500)]
Disable providers of user and status metadata when instance is private
Mark Felder [Mon, 31 Aug 2020 19:19:48 +0000 (14:19 -0500)]
Do not make RelMe metadata provider optional.
There's really no sound reason to turn this off anyway.
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:24:03 +0000 (20:24 +0200)]
user: harden get_friends_query(), get_followers_query() and their wrappers
Haelwenn (lanodan) Monnier [Wed, 2 Sep 2020 18:11:24 +0000 (20:11 +0200)]
search: Apply following filter only when user is usable
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 05:06:29 +0000 (07:06 +0200)]
AP C2S: Restrict character limit on Note
Egor Kislitsyn [Wed, 10 Jun 2020 11:37:43 +0000 (15:37 +0400)]
Fix atom leak in AdminAPIController
rinpatch [Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)]
Merge branch 'release/2.1.1' into 'stable'
2.1.1 release
See merge request pleroma/secteam/pleroma!13
rinpatch [Tue, 8 Sep 2020 17:13:00 +0000 (20:13 +0300)]
SECURITY.md: we don't support 2.0 anymore, bump to 2.1
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
rinpatch [Tue, 8 Sep 2020 12:34:20 +0000 (15:34 +0300)]
rinpatch [Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)]
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
rinpatch [Tue, 8 Sep 2020 11:21:34 +0000 (14:21 +0300)]
CHANGELOG.md: Add 2.1.1 entry
Haelwenn [Tue, 8 Sep 2020 16:42:27 +0000 (16:42 +0000)]
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
Alexander Strizhakov [Tue, 8 Sep 2020 14:29:28 +0000 (17:29 +0300)]
combo fixes
Alexander Strizhakov [Tue, 8 Sep 2020 14:12:38 +0000 (17:12 +0300)]
don't run async tests, which use Mock
feld [Tue, 8 Sep 2020 14:52:51 +0000 (14:52 +0000)]
Merge branch 'develop' into 'develop'
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
Haelwenn [Tue, 8 Sep 2020 14:52:33 +0000 (14:52 +0000)]
Merge branch 'bugfix/favicon-empty-test' into 'develop'
Bugfix/favicon empty test
See merge request pleroma/pleroma!2972
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 13:47:20 +0000 (15:47 +0200)]
account_view_test: Remove empty test
Haelwenn (lanodan) Monnier [Tue, 8 Sep 2020 14:08:01 +0000 (16:08 +0200)]
test: remove extraneous :instances_favicons config bits
Mark Felder [Tue, 8 Sep 2020 14:31:47 +0000 (09:31 -0500)]
Revert "description.exs: add ForceBotUnlistedPolicy"
This reverts commit
7215563641e2a5096293128519d6a454aabc46f2.
Mark Felder [Tue, 8 Sep 2020 14:31:26 +0000 (09:31 -0500)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
rinpatch [Tue, 8 Sep 2020 12:21:33 +0000 (12:21 +0000)]
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
rinpatch [Tue, 8 Sep 2020 12:08:51 +0000 (15:08 +0300)]
mix.exs: bump version to 2.1.1
rinpatch [Tue, 8 Sep 2020 12:06:53 +0000 (15:06 +0300)]
Disable favicon scraping in tests
Alibek Omarov [Tue, 8 Sep 2020 11:35:34 +0000 (11:35 +0000)]
changelog: add ForceBotUnlistedPolicy
Alibek Omarov [Tue, 8 Sep 2020 11:34:04 +0000 (11:34 +0000)]
docs: cheatsheet: add ForceBotUnlistedPolicy
Alibek Omarov [Tue, 8 Sep 2020 11:32:46 +0000 (11:32 +0000)]
description.exs: add ForceBotUnlistedPolicy
rinpatch [Tue, 8 Sep 2020 11:20:31 +0000 (11:20 +0000)]
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
rinpatch [Mon, 7 Sep 2020 11:38:15 +0000 (11:38 +0000)]
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController
See merge request pleroma/secteam/pleroma!6
lain [Mon, 7 Sep 2020 10:19:19 +0000 (10:19 +0000)]
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
lain [Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)]
Merge branch 'develop' into 'develop'
Added cmake
See merge request pleroma/pleroma!2953
rinpatch [Fri, 4 Sep 2020 07:17:10 +0000 (07:17 +0000)]
Merge branch 'chore/fast_html-bump' into 'develop'
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
rinpatch [Mon, 7 Sep 2020 11:12:30 +0000 (11:12 +0000)]
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
feld [Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)]
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
rinpatch [Mon, 31 Aug 2020 07:22:35 +0000 (07:22 +0000)]
Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize
See merge request pleroma/pleroma!2932
rinpatch [Wed, 2 Sep 2020 09:36:56 +0000 (09:36 +0000)]
Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
rinpatch [Wed, 2 Sep 2020 13:46:11 +0000 (13:46 +0000)]
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
rinpatch [Wed, 2 Sep 2020 09:38:43 +0000 (09:38 +0000)]
Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
rinpatch [Tue, 8 Sep 2020 09:49:27 +0000 (09:49 +0000)]
Merge branch 'fix/2087-metadata' into 'develop'
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
rinpatch [Tue, 8 Sep 2020 09:47:16 +0000 (09:47 +0000)]
Merge branch 'secfix/search-crash' into 'develop'
Fix crash done via search
See merge request pleroma/secteam/pleroma!12
rinpatch [Wed, 2 Sep 2020 06:55:58 +0000 (06:55 +0000)]
Merge branch 'fix-searching-following' into 'develop'
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
rinpatch [Mon, 7 Sep 2020 16:38:16 +0000 (16:38 +0000)]
Merge branch 'fix/apc2s-limits' into 'develop'
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
rinpatch [Tue, 8 Sep 2020 09:28:38 +0000 (12:28 +0300)]
CHANGELOG.md: move the exiftool webp entry to a proper section
Also clarify how it was fixed
Mark Felder [Sat, 5 Sep 2020 03:18:01 +0000 (22:18 -0500)]
Revert/simplify.
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
Mark Felder [Fri, 4 Sep 2020 22:56:05 +0000 (17:56 -0500)]
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
Mark Felder [Fri, 4 Sep 2020 22:50:16 +0000 (17:50 -0500)]
Verify webp files are not processed with exiftool
Mark Felder [Fri, 4 Sep 2020 22:40:59 +0000 (17:40 -0500)]
Improve upload filter return values so we can identify when filters make no changes to the input
Mark Felder [Wed, 26 Aug 2020 18:32:03 +0000 (13:32 -0500)]
Fix uploading webp image files when Exiftool Upload Filter is enabled
rinpatch [Tue, 8 Sep 2020 09:23:08 +0000 (12:23 +0300)]
CHANGELOG.md: Split settings renaming to 2 separate entries
Alibek Omarov [Mon, 7 Sep 2020 23:13:49 +0000 (01:13 +0200)]
ForceBotUnlistedPolicy: simplify code
Alibek Omarov [Mon, 7 Sep 2020 21:28:29 +0000 (23:28 +0200)]
ForceBotUnlistedPolicy: try to fix test 2
Alibek Omarov [Mon, 7 Sep 2020 21:18:36 +0000 (23:18 +0200)]
ForceBotUnlistedPolicy: try to fix test
Alibek Omarov [Mon, 7 Sep 2020 21:04:07 +0000 (23:04 +0200)]
ForceBotUnlistedPolicy: fix test extension
Alibek Omarov [Mon, 7 Sep 2020 20:53:45 +0000 (22:53 +0200)]
ForceBotUnlistedPolicy: format
Alibek Omarov [Mon, 7 Sep 2020 20:50:37 +0000 (22:50 +0200)]
ForceBotUnlistedPolicy: add test
Alibek Omarov [Mon, 7 Sep 2020 20:14:40 +0000 (22:14 +0200)]
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
Alexander Strizhakov [Mon, 7 Sep 2020 16:55:14 +0000 (19:55 +0300)]
changelog entry
Alexander Strizhakov [Mon, 7 Sep 2020 16:04:16 +0000 (19:04 +0300)]
deprecation warnings
Alexander Strizhakov [Mon, 7 Sep 2020 13:57:42 +0000 (16:57 +0300)]
passing adapter options directly without adapter key
Alexander Strizhakov [Sat, 5 Sep 2020 09:41:01 +0000 (12:41 +0300)]
migrations for renaming gun timeout options
Alexander Strizhakov [Fri, 4 Sep 2020 16:05:08 +0000 (19:05 +0300)]
adapter options unification
not needed options deletion
rinpatch [Mon, 7 Sep 2020 16:49:27 +0000 (16:49 +0000)]
Merge branch 'feature/1790-oban-overuse' into 'develop'
removing StatsWorker from Oban cron jobs
See merge request pleroma/pleroma!2963
rinpatch [Mon, 7 Sep 2020 16:22:56 +0000 (19:22 +0300)]
CHANGELOG.md: move Unreleased section ahead of unreleased-patch
Alexander Strizhakov [Sun, 6 Sep 2020 09:13:26 +0000 (12:13 +0300)]
removing Stats worker from Oban cron jobs
rinpatch [Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)]
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
rinpatch [Mon, 7 Sep 2020 12:38:22 +0000 (12:38 +0000)]
Merge branch 'chore/back-to-upstream-tesla' into 'develop'
switch back to upstream tesla
See merge request pleroma/pleroma!2966
rinpatch [Mon, 7 Sep 2020 12:21:20 +0000 (15:21 +0300)]
switch back to upstream tesla
The patch we required got merged upstream: https://github.com/teamon/tesla/commit/
9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30
rinpatch [Mon, 7 Sep 2020 12:16:04 +0000 (15:16 +0300)]
Add a changelog entry for hackney downgrade
rinpatch [Mon, 7 Sep 2020 11:12:30 +0000 (11:12 +0000)]
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
lain [Mon, 7 Sep 2020 10:19:19 +0000 (10:19 +0000)]
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
Haelwenn [Mon, 7 Sep 2020 08:18:59 +0000 (08:18 +0000)]
Merge branch 'fix/no-rich-media-error' into 'develop'
RichMedia: do not log webpages missing metadata as errors
See merge request pleroma/pleroma!2960
Haelwenn [Mon, 7 Sep 2020 08:14:34 +0000 (08:14 +0000)]
Merge branch 'chore/add-cc-by-4' into 'develop'
Add a copy of CC-BY-4.0 to the repo
See merge request pleroma/pleroma!2962
Haelwenn (lanodan) Monnier [Sat, 5 Sep 2020 04:38:07 +0000 (06:38 +0200)]
instance: Log catch favicon errors as warnings
rinpatch [Sun, 6 Sep 2020 08:38:38 +0000 (11:38 +0300)]
Add a copy of CC-BY-4.0 to the repo
We mentined it in COPYING, but didn't actually have a copy in the repo.
rinpatch [Sat, 5 Sep 2020 19:00:51 +0000 (22:00 +0300)]
RichMedia: do not log webpages missing metadata as errors
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
rinpatch [Sat, 5 Sep 2020 19:04:19 +0000 (19:04 +0000)]
Merge branch 'hotfix-the-hotfix' into 'develop'
ConnectionPool: fix the previous hotfix
See merge request pleroma/pleroma!2959
rinpatch [Sat, 5 Sep 2020 18:36:17 +0000 (21:36 +0300)]
ConnectionPool middleware: handle connection opening errors
rinpatch [Sat, 5 Sep 2020 18:27:06 +0000 (21:27 +0300)]
ConnectionPool: fix the previous hotfix
I rushed the hotfix and forgot how `pop_in` actually works,
I want to die. We need some integration tests for the HTTP client
rinpatch [Sat, 5 Sep 2020 18:18:49 +0000 (18:18 +0000)]
Merge branch 'hotfix/tesla-env-no-access' into 'develop'
ConnectionPool middleware: fix a crash due to unimplemented behaviour
See merge request pleroma/pleroma!2958
rinpatch [Sat, 5 Sep 2020 18:17:03 +0000 (21:17 +0300)]
ConnectionPool middleware: fix a crash due to unimplemented behaviour
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
rinpatch [Sat, 5 Sep 2020 09:37:27 +0000 (12:37 +0300)]
Rich Media: Do not cache URLs for preview statuses
Closes #1987
rinpatch [Sat, 5 Sep 2020 17:47:12 +0000 (17:47 +0000)]
Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
See merge request pleroma/pleroma!2954
Alexander Strizhakov [Sat, 5 Sep 2020 08:15:27 +0000 (11:15 +0300)]
use override flag for hackney dependency
Haelwenn (lanodan) Monnier [Fri, 4 Sep 2020 05:52:22 +0000 (07:52 +0200)]
Prevent AccountView and instance.get_or_update_favicon fails
Haelwenn [Sat, 5 Sep 2020 03:10:54 +0000 (03:10 +0000)]
Merge branch 'use-https-in-dockerfile' into 'develop'
Use TLS when adding Alpine community repository in Dockerfile
See merge request pleroma/pleroma!2955
James Alseth [Sat, 5 Sep 2020 02:19:56 +0000 (19:19 -0700)]
Use TLS when adding Alpine community repository in Dockerfile
rinpatch [Fri, 4 Sep 2020 19:10:40 +0000 (22:10 +0300)]
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414
lain [Fri, 4 Sep 2020 18:19:23 +0000 (18:19 +0000)]
Merge branch 'develop' into 'develop'
Added cmake
See merge request pleroma/pleroma!2953
Farhan Khan [Fri, 4 Sep 2020 18:03:58 +0000 (18:03 +0000)]
Added cmake
Alexander Strizhakov [Fri, 4 Sep 2020 11:45:30 +0000 (14:45 +0300)]
fix for ReverseProxy
Alexander Strizhakov [Fri, 4 Sep 2020 11:24:15 +0000 (14:24 +0300)]
temp hackney fix
projects / akkoma / log