akkoma
3 years agoSession token setting on token exchange. Auth-related refactoring.
Ivan Tashkinov [Wed, 25 Nov 2020 18:47:23 +0000 (21:47 +0300)]
Session token setting on token exchange. Auth-related refactoring.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years agoSession-based OAuth auth fixes (token expiration check), refactoring, tweaks.
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:25 +0000 (19:47 +0300)]
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.

3 years agoMerge branch 'fix/2302-report-duplicates' into 'develop'
feld [Fri, 20 Nov 2020 18:40:15 +0000 (18:40 +0000)]
Merge branch 'fix/2302-report-duplicates' into 'develop'

Fix for forwarded reports

Closes #2303 and #2302

See merge request pleroma/pleroma!3146

3 years agoMerge branch 'fix/mix-tasks' into 'develop'
lain [Fri, 20 Nov 2020 10:30:02 +0000 (10:30 +0000)]
Merge branch 'fix/mix-tasks' into 'develop'

Start limiters in mix tasks

Closes #2320

See merge request pleroma/pleroma!3165

3 years agostart limiters in mix tasks
Alexander Strizhakov [Fri, 20 Nov 2020 08:37:01 +0000 (11:37 +0300)]
start limiters in mix tasks

3 years agoMerge branch '2301-users-search-discoverability-fix' into 'develop'
feld [Thu, 19 Nov 2020 20:33:52 +0000 (20:33 +0000)]
Merge branch '2301-users-search-discoverability-fix' into 'develop'

[#2301] Proper handling of User.is_discoverable

Closes #2301

See merge request pleroma/pleroma!3162

3 years agoMerge branch 'oban-jobs-to-simple-tasks' into 'develop'
feld [Thu, 19 Nov 2020 20:32:32 +0000 (20:32 +0000)]
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'

Moving some background jobs into simple tasks

Closes #1790

See merge request pleroma/pleroma!3129

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discover...
Ivan Tashkinov [Thu, 19 Nov 2020 16:35:44 +0000 (19:35 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix

# Conflicts:
# CHANGELOG.md

3 years ago[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search...
Ivan Tashkinov [Thu, 19 Nov 2020 16:30:02 +0000 (19:30 +0300)]
[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.

3 years agoMerge branch '2317-old-reset-tokens' into 'develop'
Haelwenn [Thu, 19 Nov 2020 16:22:14 +0000 (16:22 +0000)]
Merge branch '2317-old-reset-tokens' into 'develop'

Resolve "Don't allow old password reset tokens"

Closes #2317

See merge request pleroma/pleroma!3160

3 years agoMerge branch 'fix-rum-search' into 'develop'
rinpatch [Thu, 19 Nov 2020 16:20:59 +0000 (16:20 +0000)]
Merge branch 'fix-rum-search' into 'develop'

Fix rum search speed

See merge request pleroma/pleroma!3161

3 years agoCHANGELOG.md: Move rum fix entry to patch section
rinpatch [Thu, 19 Nov 2020 16:13:19 +0000 (19:13 +0300)]
CHANGELOG.md: Move rum fix entry to patch section

Also includes minor cosmetical fixes.

3 years agoSearch: Only skip ordering the rum index.
lain [Thu, 19 Nov 2020 15:29:31 +0000 (16:29 +0100)]
Search: Only skip ordering the rum index.

3 years ago[#2301] Quick fix: users with is_discoverable == false (default!) are included in...
Ivan Tashkinov [Thu, 19 Nov 2020 15:08:22 +0000 (18:08 +0300)]
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.

3 years agolittle fix
Alexander Strizhakov [Thu, 19 Nov 2020 12:29:26 +0000 (15:29 +0300)]
little fix

3 years agoChangelog: Add info about search fixes.
lain [Thu, 19 Nov 2020 12:23:58 +0000 (13:23 +0100)]
Changelog: Add info about search fixes.

3 years agoActivity search: Fix order of results
lain [Thu, 19 Nov 2020 12:20:58 +0000 (13:20 +0100)]
Activity search: Fix order of results

Greatly speeds up the search for RUM.

3 years agoChangelog: Add info about reset tokens
lain [Thu, 19 Nov 2020 11:29:41 +0000 (12:29 +0100)]
Changelog: Add info about reset tokens

3 years agoCheatsheet: Add docs about reset token expiration
lain [Thu, 19 Nov 2020 11:28:39 +0000 (12:28 +0100)]
Cheatsheet: Add docs about reset token expiration

3 years agoPassword Resets: Don't accept tokens above a certain age.
lain [Thu, 19 Nov 2020 11:27:06 +0000 (12:27 +0100)]
Password Resets: Don't accept tokens above a certain age.

By default, one day

3 years agoMerge branch 'hide-muted-reactions' into 'develop'
lain [Thu, 19 Nov 2020 10:58:28 +0000 (10:58 +0000)]
Merge branch 'hide-muted-reactions' into 'develop'

Hide reactions from muted and blocked users

Closes #1875

See merge request pleroma/pleroma!3147

3 years agolog capture
Alexander Strizhakov [Wed, 18 Nov 2020 13:36:24 +0000 (16:36 +0300)]
log capture

3 years agotest fixes
Alexander Strizhakov [Wed, 18 Nov 2020 07:03:48 +0000 (10:03 +0300)]
test fixes

3 years agochangelog entries for fixes
Alexander Strizhakov [Tue, 17 Nov 2020 17:03:28 +0000 (20:03 +0300)]
changelog entries for fixes

3 years agofix for mastodon forwarded reports
Alexander Strizhakov [Tue, 17 Nov 2020 16:57:57 +0000 (19:57 +0300)]
fix for mastodon forwarded reports

3 years agoformatting
Alexander Strizhakov [Mon, 16 Nov 2020 16:41:03 +0000 (19:41 +0300)]
formatting

3 years agofix for forwarded reports
Alexander Strizhakov [Mon, 16 Nov 2020 16:22:32 +0000 (19:22 +0300)]
fix for forwarded reports

3 years agoMerge branch 'revert-da4660d2' into 'develop'
feld [Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)]
Merge branch 'revert-da4660d2' into 'develop'

Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request pleroma/pleroma!3158

3 years agoRevert "Merge branch 'use-https-in-dockerfile' into 'develop'"
feld [Wed, 18 Nov 2020 20:32:30 +0000 (20:32 +0000)]
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

This reverts merge request !2955

3 years agoMerge branch 'develop' into 'hide-muted-reactions'
minibikini [Wed, 18 Nov 2020 20:22:40 +0000 (20:22 +0000)]
Merge branch 'develop' into 'hide-muted-reactions'

# Conflicts:
#   CHANGELOG.md

3 years agoFixed emoji reactions not being filtered from blocked and muted accounts
Mark Felder [Wed, 18 Nov 2020 20:13:25 +0000 (20:13 +0000)]
Fixed emoji reactions not being filtered from blocked and muted accounts

3 years agoMerge branch 'fix/mix-task-user-delete_activities' into 'develop'
feld [Wed, 18 Nov 2020 18:57:47 +0000 (18:57 +0000)]
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'

Fix mix pleroma.user delete_activities task

See merge request pleroma/pleroma!3156

3 years agoMerge branch 'fix/webpush-and-emojireact' into 'develop'
lain [Wed, 18 Nov 2020 18:33:48 +0000 (18:33 +0000)]
Merge branch 'fix/webpush-and-emojireact' into 'develop'

Push notifications: add pleroma:emoji_reaction, improve tests

Closes #2185

See merge request pleroma/pleroma!3141

3 years agoApply 1 suggestion(s) to 1 file(s)
lain [Wed, 18 Nov 2020 18:27:30 +0000 (18:27 +0000)]
Apply 1 suggestion(s) to 1 file(s)

3 years agoMerge branch 'frontend-admin-api' into 'develop'
lain [Wed, 18 Nov 2020 17:51:57 +0000 (17:51 +0000)]
Merge branch 'frontend-admin-api' into 'develop'

Add an API to manage frontends

Closes #2238

See merge request pleroma/pleroma!3108

3 years agoChangelog: Move api info to api heading.
lain [Wed, 18 Nov 2020 17:32:13 +0000 (18:32 +0100)]
Changelog: Move api info to api heading.

3 years agoMerge branch 'update/admin-fe-20201117' into 'develop'
feld [Tue, 17 Nov 2020 23:16:17 +0000 (23:16 +0000)]
Merge branch 'update/admin-fe-20201117' into 'develop'

Update AdminFE

See merge request pleroma/pleroma!3157

3 years agoUpdate AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20d
Mark Felder [Tue, 17 Nov 2020 23:01:34 +0000 (17:01 -0600)]
Update AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20d

3 years agoAdd test for POST when push is disabled
Mark Felder [Tue, 17 Nov 2020 22:18:22 +0000 (22:18 +0000)]
Add test for POST when push is disabled

Also group together the tests verifiying failure when disabled

3 years agoRevert adding extra alert types here
Mark Felder [Tue, 17 Nov 2020 21:37:17 +0000 (21:37 +0000)]
Revert adding extra alert types here

3 years agoFix incorrect test description
Mark Felder [Tue, 17 Nov 2020 21:34:18 +0000 (21:34 +0000)]
Fix incorrect test description

3 years agoCredo
Mark Felder [Tue, 17 Nov 2020 20:33:30 +0000 (20:33 +0000)]
Credo

3 years agoTest that we ignore invalid subscription alert types separately.
Mark Felder [Tue, 17 Nov 2020 20:18:51 +0000 (20:18 +0000)]
Test that we ignore invalid subscription alert types separately.

3 years agoEnsure all supported push notification subscription alert types are tested
Mark Felder [Tue, 17 Nov 2020 20:14:38 +0000 (20:14 +0000)]
Ensure all supported push notification subscription alert types are tested

3 years agoSynchronize reaction notification text with PleromaFE's style
Mark Felder [Tue, 17 Nov 2020 19:51:37 +0000 (19:51 +0000)]
Synchronize reaction notification text with PleromaFE's style

3 years agoSupport both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscri...
Mark Felder [Tue, 17 Nov 2020 20:21:48 +0000 (20:21 +0000)]
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription

3 years agoUpdate OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction...
Mark Felder [Tue, 17 Nov 2020 19:15:11 +0000 (19:15 +0000)]
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions

3 years agoSpelling
Mark Felder [Tue, 17 Nov 2020 19:06:30 +0000 (19:06 +0000)]
Spelling

3 years agoDocument the API extensions for push subscriptions
Mark Felder [Tue, 17 Nov 2020 19:05:36 +0000 (19:05 +0000)]
Document the API extensions for push subscriptions

3 years agoAllow subscribing for pleroma:emoji_reaction push notifications
Mark Felder [Tue, 17 Nov 2020 18:33:40 +0000 (18:33 +0000)]
Allow subscribing for pleroma:emoji_reaction push notifications

3 years agoAdd capability for emoji reaction push notifications
Mark Felder [Fri, 13 Nov 2020 23:01:53 +0000 (17:01 -0600)]
Add capability for emoji reaction push notifications

3 years agoDocs: Add info about frontend install error response
lain [Tue, 17 Nov 2020 15:44:20 +0000 (16:44 +0100)]
Docs: Add info about frontend install error response

3 years agoFrontendController: Return error on installation error.
lain [Tue, 17 Nov 2020 15:43:07 +0000 (16:43 +0100)]
FrontendController: Return error on installation error.

3 years agoDocument fixing the pleroma.user delete_activities mix task
Mark Felder [Tue, 17 Nov 2020 15:28:46 +0000 (15:28 +0000)]
Document fixing the pleroma.user delete_activities mix task

3 years agoNeed to start web_resp cache or mix task fails
Mark Felder [Tue, 17 Nov 2020 15:15:53 +0000 (15:15 +0000)]
Need to start web_resp cache or mix task fails

3 years agoMerge branch 'remove/fedsockets' into 'develop'
feld [Tue, 17 Nov 2020 14:58:33 +0000 (14:58 +0000)]
Merge branch 'remove/fedsockets' into 'develop'

Remove FedSockets

See merge request pleroma/pleroma!3155

3 years agoMerge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
rinpatch [Tue, 17 Nov 2020 14:52:08 +0000 (14:52 +0000)]
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'

Specify the architecture for arm gitlab jobs

See merge request pleroma/pleroma!3139

3 years agoMerge branch 'develop' into frontend-admin-api
Egor Kislitsyn [Tue, 17 Nov 2020 14:34:04 +0000 (18:34 +0400)]
Merge branch 'develop' into frontend-admin-api

3 years agoMerge remote-tracking branch 'origin/develop' into hide-muted-reactions
Egor Kislitsyn [Tue, 17 Nov 2020 14:30:10 +0000 (18:30 +0400)]
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions

3 years agoMerge branch 'develop' into hide-muted-reactions
Egor Kislitsyn [Tue, 17 Nov 2020 14:29:52 +0000 (18:29 +0400)]
Merge branch 'develop' into hide-muted-reactions

3 years agoRemove FedSockets
rinpatch [Tue, 17 Nov 2020 14:28:30 +0000 (17:28 +0300)]
Remove FedSockets

Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
 ets table until the value changes, or double JSON encoding).

Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
 are just too overkill for what they were trying to accomplish, which is
 reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
 logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.

From discussions I had with other Pleroma developers it seems like they
 would approve the descision to remove them as well,
therefore I am submitting this patch.

3 years agoMerge branch 'chores/note-handling-move' into 'develop'
lain [Tue, 17 Nov 2020 14:16:53 +0000 (14:16 +0000)]
Merge branch 'chores/note-handling-move' into 'develop'

Chores/note handling move

See merge request pleroma/pleroma!3122

3 years agoMerge branch 'feature/local-only-scope' into 'develop'
lain [Tue, 17 Nov 2020 14:08:45 +0000 (14:08 +0000)]
Merge branch 'feature/local-only-scope' into 'develop'

Add local-only statuses

Closes #75 and #1483

See merge request pleroma/pleroma!2289

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only...
lain [Tue, 17 Nov 2020 14:01:38 +0000 (15:01 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope

3 years agoMerge branch 'fix/debian-install-libmagic-typo' into 'develop'
rinpatch [Tue, 17 Nov 2020 13:24:01 +0000 (13:24 +0000)]
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'

Debian installation guide: fix libmagic header package name

See merge request pleroma/pleroma!3154

3 years agoDebian installation guide: fix libmagic header package name
rinpatch [Tue, 17 Nov 2020 13:11:37 +0000 (16:11 +0300)]
Debian installation guide: fix libmagic header package name

It's libmagic-dev in both Ubuntu and Debian.

Reported in private by NaiJi.

3 years agoMerge branch 'feat/add-bundles-to-gitattributes' into 'develop'
rinpatch [Tue, 17 Nov 2020 12:55:09 +0000 (12:55 +0000)]
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'

.gitattributes: Treat js/css/source maps as binary files

See merge request pleroma/pleroma!3153

3 years agoMerge branch 'chores/tesla_1.4.0' into 'develop'
rinpatch [Tue, 17 Nov 2020 12:42:51 +0000 (12:42 +0000)]
Merge branch 'chores/tesla_1.4.0' into 'develop'

mix.exs: Update tesla to 1.4.0

See merge request pleroma/pleroma!3152

3 years agoMerge branch 'sync-stable/2.2.0' into 'develop'
rinpatch [Tue, 17 Nov 2020 12:40:42 +0000 (12:40 +0000)]
Merge branch 'sync-stable/2.2.0' into 'develop'

Import stable commits into develop after releasing 2.2.0

Closes #2275, #1516, #2257, #2242, #1668, and #2236

See merge request pleroma/pleroma!3151

3 years ago.gitattributes: Treat js/css/source maps as binary files
rinpatch [Tue, 17 Nov 2020 12:38:28 +0000 (15:38 +0300)]
.gitattributes: Treat js/css/source maps as binary files

This prevents `git grep` from showing the matching line and diffs from
being shown by default.

3 years agoCHANGELOG.md: Use a period after every bullet point for unreleased sections
rinpatch [Tue, 17 Nov 2020 12:21:46 +0000 (15:21 +0300)]
CHANGELOG.md: Use a period after every bullet point for unreleased sections

It has been the de-facto style for a while now, however it is not
enforced, so there were some entries that didn't use it.

3 years agoCHANGELOG.md: Add back an entry for S3 fix
rinpatch [Tue, 17 Nov 2020 12:20:57 +0000 (15:20 +0300)]
CHANGELOG.md: Add back an entry for S3 fix

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Tue, 17 Nov 2020 12:16:54 +0000 (12:16 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3127

3 years agomix.exs: bump development version to 2.2.50 after 2.2.0 release
rinpatch [Tue, 17 Nov 2020 12:14:35 +0000 (15:14 +0300)]
mix.exs: bump development version to 2.2.50 after 2.2.0 release

3 years agoImport stable commits into develop after releasing 2.2.0
rinpatch [Tue, 17 Nov 2020 12:10:58 +0000 (15:10 +0300)]
Import stable commits into develop after releasing 2.2.0

Updates the frontend bundle and syncs the changelog.

3 years agoActivityPubController: Don't return local only objects
lain [Tue, 17 Nov 2020 12:11:39 +0000 (13:11 +0100)]
ActivityPubController: Don't return local only objects

3 years agomix.exs: Update tesla to 1.4.0
Haelwenn (lanodan) Monnier [Tue, 17 Nov 2020 12:09:56 +0000 (13:09 +0100)]
mix.exs: Update tesla to 1.4.0

3 years agoGitlab CI: Specify image architecture for arm64 images
lain [Tue, 17 Nov 2020 11:42:55 +0000 (12:42 +0100)]
Gitlab CI: Specify image architecture for arm64 images

3 years agoAdded translation using Weblate (Hebrew)
Guy Sheffer [Tue, 10 Nov 2020 13:39:17 +0000 (13:39 +0000)]
Added translation using Weblate (Hebrew)

3 years agoMerge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
lain [Tue, 17 Nov 2020 11:14:50 +0000 (11:14 +0000)]
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'

Fix S3 uploads with Elixir 1.11

See merge request pleroma/pleroma!3148

3 years agoMerge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
lain [Tue, 17 Nov 2020 11:12:20 +0000 (11:12 +0000)]
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'

Use absolute URLs to thumbnail and background in /api/v1/instance

See merge request pleroma/pleroma!3149

3 years agoUse absolute URLs to thumbnail and background in /api/v1/instance
Mark Felder [Mon, 16 Nov 2020 21:29:15 +0000 (21:29 +0000)]
Use absolute URLs to thumbnail and background in /api/v1/instance

3 years agoDocument S3 and Elixir 1.11 compat fix
Mark Felder [Mon, 16 Nov 2020 19:54:02 +0000 (19:54 +0000)]
Document S3 and Elixir 1.11 compat fix

3 years agoFix S3 uploads with Elixir 1.11
Mark Felder [Mon, 16 Nov 2020 19:51:44 +0000 (19:51 +0000)]
Fix S3 uploads with Elixir 1.11

3 years agoHide reactions from muted and blocked users
Egor Kislitsyn [Mon, 16 Nov 2020 18:23:25 +0000 (22:23 +0400)]
Hide reactions from muted and blocked users

3 years agoMerge branch 'bugfix/instance-gen_exiftool' into 'develop'
Haelwenn [Sat, 14 Nov 2020 21:43:07 +0000 (21:43 +0000)]
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'

pleroma.instance: Fix Exiftool module name

See merge request pleroma/pleroma!3143

3 years agopleroma.instance: Fix Exiftool module name
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name

3 years agoGitlab CI: Change tags bag to arm32
lain [Fri, 13 Nov 2020 15:19:09 +0000 (16:19 +0100)]
Gitlab CI: Change tags bag to arm32

3 years agoGitlab CI: Alpine is alpine
lain [Fri, 13 Nov 2020 13:48:40 +0000 (14:48 +0100)]
Gitlab CI: Alpine is alpine

3 years agoMerge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
lain [Fri, 13 Nov 2020 13:35:47 +0000 (13:35 +0000)]
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'

fixes 2034 Make notifs view work for reports

Closes #2034

See merge request pleroma/pleroma!2912

3 years agoMake notifs view work for reports
Ilja [Fri, 13 Nov 2020 13:35:46 +0000 (13:35 +0000)]
Make notifs view work for reports

* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)

3 years agoMerge branch 'docs/otp-tuning' into 'develop'
lain [Fri, 13 Nov 2020 13:31:46 +0000 (13:31 +0000)]
Merge branch 'docs/otp-tuning' into 'develop'

First draft of tips for optimizing BEAM

See merge request pleroma/pleroma!3123

3 years agoGitlab CI: Specify arm32v7 image for arm32 builds
lain [Fri, 13 Nov 2020 13:23:24 +0000 (14:23 +0100)]
Gitlab CI: Specify arm32v7 image for arm32 builds

3 years agoMerge branch 'fix/oban-in-database-config' into 'develop'
rinpatch [Fri, 13 Nov 2020 10:32:16 +0000 (10:32 +0000)]
Merge branch 'fix/oban-in-database-config' into 'develop'

remove PurgeExpiredActivity from Oban db config

See merge request pleroma/pleroma!3137

3 years agoremove PurgeExpiredActivity from Oban db config
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config

3 years agoMerge branch 'majic-dep' into 'develop'
feld [Thu, 12 Nov 2020 22:41:00 +0000 (22:41 +0000)]
Merge branch 'majic-dep' into 'develop'

Install file-dev in Dockerfile build stage

See merge request pleroma/pleroma!3135

3 years agoInstall file-dev in Dockerfile build stage
Michael Walker [Thu, 12 Nov 2020 22:20:17 +0000 (22:20 +0000)]
Install file-dev in Dockerfile build stage

This is required by the majic, added in #2534.

3 years agoMerge branch 'release/2.2.0' into 'stable'
rinpatch [Thu, 12 Nov 2020 12:34:48 +0000 (12:34 +0000)]
Merge branch 'release/2.2.0' into 'stable'

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

3 years agoFix object spoofing vulnerability in attachments
rinpatch [Wed, 28 Oct 2020 15:08:23 +0000 (18:08 +0300)]
Fix object spoofing vulnerability in attachments

Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects.

content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
 possibility I missed something.

Closes pleroma#1948