bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15091 commits 1 branch 0 tags 292 MiB
Commit graph

15091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
f6afe649fe
GenerateUnsetUserKeys: only select necessary user fields 2022-09-28 17:58:25 -05:00
Alex Gleason
9137089895
CI Docker: remove README, adapt build_and_push.sh 2022-09-28 17:42:57 -05:00
Alex Gleason
5dfb582bd2
Revert "Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'" 
This reverts commit 757a21554f, reversing
changes made to 5d7d623390.
 2022-09-28 17:41:36 -05:00
Alex Gleason
ecd2d32dc2
ci/Dockerfile: tabs to spaces 2022-09-28 17:39:58 -05:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
marcin mikołajczak
31f5bafe64 Merge branch 'move-cooldown-period' into 'develop' 
Add migration cooldown period

Closes #107

See merge request soapbox-pub/rebased!183
 2022-09-28 22:00:40 +00:00
marcin mikołajczak
c6fddd6e0a Add migration cooldown period 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-28 23:48:45 +02:00
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00
Haelwenn
d43d02bf41 Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop' 
Make instance document controller test sync

Closes #2940

See merge request pleroma/pleroma!3757
 2022-09-27 21:50:43 +00:00
Haelwenn
757a21554f Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop' 
Reduce incoming and outgoing federation queue sizes to 5

Closes #2169

See merge request pleroma/pleroma!3756
 2022-09-27 21:50:06 +00:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
marcin mikołajczak
54daefaecc Merge branch 'manifest' into 'develop' 
Add shortcuts and share_target to manifest.json

See merge request soapbox-pub/rebased!182
 2022-09-24 19:26:11 +00:00
marcin mikołajczak
f5fe5b4544 Add shortcuts and share_target to manifest.json 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-24 18:34:09 +02:00
Tusooa Zhu
e66c02b775
Make instance document controller test sync 2022-09-20 12:34:10 -04:00
tusooa
ac95b8b4f3 Merge branch 'websocketex' into 'develop' 
Use Websockex to replace websocket_client

See merge request pleroma/pleroma!3743
 2022-09-18 17:09:12 +00:00
Tusooa Zhu
467b6cad6f
Reduce incoming and outgoing federation queue sizes to 5 2022-09-17 16:34:33 -04:00
tusooa
1a7107f4a5 Merge branch 'remove_from_followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
 2022-09-16 23:24:13 +00:00
Alex Gleason
64efa18c38 Merge branch 'object-delete-slower' into 'develop' 
Slow down ContextObjectsDeletionMigrator

Closes #102

See merge request soapbox-pub/rebased!181
 2022-09-16 01:11:05 +00:00
a1batross
7f63b4c315 User: search: exclude deactivated users from user search 
This way we don't pollute search results with deactivated and deleted users
 2022-09-16 00:49:16 +03:00
Alex Gleason
589e9b395f
Slow down ContextObjectsDeletionMigrator 2022-09-15 11:37:09 -05:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
Alex Gleason
c6e4a12322 Merge branch 'soapbox-fe' into 'develop' 
soapbox-fe --> soapbox

See merge request soapbox-pub/rebased!180
 2022-09-13 23:13:41 +00:00
Alex Gleason
2f259173c3
Tag erratic tests 2022-09-13 15:57:50 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
tusooa
90d4b7d604 Merge branch 'fix/user-factory-speed' into 'develop' 
tests/Factory: improve user generation performance

See merge request pleroma/pleroma!3754
 2022-09-12 00:53:14 +00:00
FloatingGhost
6bdf451ce8
Use set of pregenerated RSA keys 
Randomness is a huge resource sink, so let's just use
a some that we made earlier
 2022-09-11 21:33:20 +02:00
tusooa
ac427de851 Merge branch 'fix/undo-boosts' into 'develop' 
ObjectView: do not fetch an object for its ID

See merge request pleroma/pleroma!3753
 2022-09-11 17:10:26 +00:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID 
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
 2022-09-11 04:54:04 +02:00
marcin mikołajczak
98ccf6cbdc Merge branch 'webfinger-expanding' into 'develop' 
Webfinger expanding

See merge request soapbox-pub/rebased!96
 2022-09-10 22:03:10 +00:00
Alex Gleason
31d5a6066b Merge branch 'fix-edit-test' into 'develop' 
NotificationTest: update edit notification test for async worker

See merge request soapbox-pub/rebased!177
 2022-09-06 17:37:36 +00:00
Haelwenn
453a66f8c2 Merge branch 'weblate-extract' into 'develop' 
Extract translatable strings

See merge request pleroma/pleroma!3748
 2022-09-06 17:17:40 +00:00
Alex Gleason
4b62d36fe5
NotificationTest: update edit notification test for async worker 2022-09-06 12:00:13 -05:00
weblate-extractor
3d32c92b37 Extract translatable strings 2022-09-06 16:45:08 +00:00
Alex Gleason
ce9bacc3be Merge branch 'fix-subscriptions' into 'develop' 
Create notifications async with NotificationWorker, #91

See merge request soapbox-pub/rebased!173
 2022-09-06 16:33:02 +00:00
Alex Gleason
7375535af2
Update description.exs with :poll_notifications and :notifications oban queues 2022-09-06 11:04:22 -05:00
tusooa
c0b265b404 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request pleroma/pleroma!3747
 2022-09-06 12:40:02 +00:00
marcin mikołajczak
0680650e5d Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!172
 2022-09-05 21:53:20 +00:00
Alex Gleason
8a38fcf52f Merge branch 'deps-mix-lock' into 'develop' 
GitLab CI: only run deps when mix.lock changes

See merge request soapbox-pub/rebased!175
 2022-09-05 19:57:23 +00:00
Alex Gleason
42f668558e
GitLab CI: only run deps when mix.lock changes 2022-09-05 14:28:34 -05:00
Alex Gleason
5b8b21b9e9
Fix tests for async notifications 2022-09-05 14:25:23 -05:00
marcin mikołajczak
9ab3cce7e4 Merge branch 'birthday-config-description' into 'develop' 
Clarify `birthday_min_age` config description

See merge request soapbox-pub/rebased!174
 2022-09-05 18:43:28 +00:00
marcin mikołajczak
c6bc523914 Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:25:01 +02:00
marcin mikołajczak
580bb1439b Clarify birthday_min_age config description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 20:24:04 +02:00
Alex Gleason
05a20c8d6d
Create notifications async with NotificationWorker, #91 2022-09-05 12:38:30 -05:00
Haelwenn
b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' 
Make backups require its own scope

Closes #2892

See merge request pleroma/pleroma!3721
 2022-09-05 15:42:02 +00:00
Haelwenn
346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' 
User: generate private keys on user creation

See merge request pleroma/pleroma!3737
 2022-09-05 15:38:15 +00:00
tusooa
f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
tusooa
9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' 
# Conflicts:
#   CHANGELOG.md
 2022-09-05 15:00:19 +00:00
marcin mikołajczak
d4eccd86b3 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 15:30:14 +02:00
Alex Gleason
c208af8472 Merge branch 'improve-ci' into 'develop' 
Improve CI

See merge request soapbox-pub/rebased!168
 2022-09-05 04:24:24 +00:00