Commit graph

14348 commits

Author SHA1 Message Date
sadposter fdeef7d4df Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop 2021-12-12 17:39:44 +00:00
floatingghost cfb8aa7e59 Merge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop
Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma/pulls/1
2021-12-12 17:37:27 +00:00
FloatingGhost 0fbf7faf85 Remove IO inspect 2021-12-12 17:35:35 +00:00
FloatingGhost de60b1f3c1 make search provider configurable 2021-12-12 17:35:35 +00:00
FloatingGhost fce13cce46 add extra filters 2021-12-12 17:35:35 +00:00
FloatingGhost 449d8ff165 integrate search endpoint with ES 2021-12-12 17:35:35 +00:00
FloatingGhost 9002e5155b Add import functionality 2021-12-12 17:35:35 +00:00
Alex Gleason 938c95d75d VideoHandlingTest: remove nil values 2021-12-12 17:35:35 +00:00
Haelwenn ecab82dea7 Apply alexgleason's suggestion(s) to 1 file(s) 2021-12-12 17:35:35 +00:00
Alex Gleason 2936adbbce Fix VideoHandlingTest 2021-12-12 17:35:34 +00:00
Alex Gleason da83839dc1 AttachmentValidator: ingest width and height 2021-12-12 17:35:02 +00:00
Alex Gleason 494149f173 Transmogrifier: test fix_attachments/1 2021-12-12 17:35:02 +00:00
Alex Gleason 185d70ed3d Benchmarks: fix user timeline and tags benchmarks 2021-12-12 17:35:02 +00:00
Lain Soykaf eb7bbe3fc8 Linting. 2021-12-12 17:35:02 +00:00
Finn Behrens 66b60f1ee2 move result into with guard 2021-12-12 17:35:02 +00:00
Alex Gleason 2ac3d341b0 Fix benchmarks 2021-12-12 17:35:02 +00:00
FloatingGhost 0fab887eee make linter happy 2021-12-12 17:35:02 +00:00
FloatingGhost 429407ba0a Make deactivated user check into a subquery
Fixes #2792
2021-12-12 17:35:02 +00:00
FloatingGhost 47833e31ad Remove IO inspect 2021-12-12 17:26:06 +00:00
FloatingGhost ed3a866f94 make search provider configurable 2021-12-12 17:23:44 +00:00
marcin mikołajczak dff435488d Add link headers in ChatController.index2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-12 17:43:18 +01:00
FloatingGhost 345eb7b3f8 add extra filters 2021-12-11 19:56:15 +00:00
FloatingGhost 3478492945 integrate search endpoint with ES 2021-12-11 18:48:46 +00:00
FloatingGhost c684265585 Add import functionality 2021-12-11 17:36:49 +00:00
lain fb0aa0661c Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions

Closes #2794

See merge request pleroma/pleroma!3559
2021-12-09 16:05:06 +00:00
lain 60295b58f9 Merge branch 'benchmark-fixes' into 'develop'
Benchmarks: fix user timeline and tags benchmarks

See merge request pleroma/pleroma!3560
2021-12-09 15:38:26 +00:00
Alex Gleason d194b5b7fe
Benchmarks: fix user timeline and tags benchmarks 2021-12-08 11:54:41 -06:00
Alex Gleason 01cc099c8e
VideoHandlingTest: remove nil values 2021-12-07 21:55:54 -05:00
Haelwenn 992d9287d0 Apply alexgleason's suggestion(s) to 1 file(s) 2021-12-07 22:53:36 +00:00
Alex Gleason 2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions 2021-12-07 13:41:54 -05:00
Alex Gleason 335684182a
Fix VideoHandlingTest 2021-12-07 13:35:34 -05:00
lain b57041c59a Merge branch 'fixyfix' into 'develop'
Linting.

See merge request pleroma/pleroma!3558
2021-12-07 18:19:43 +00:00
Alex Gleason 3f03d71ea6
AttachmentValidator: ingest width and height 2021-12-07 12:59:03 -05:00
Lain Soykaf ca8c676867 Linting. 2021-12-07 12:12:23 -05:00
lain 500e126604 Merge branch 'pleroma-result-1_13' into 'develop'
move result into with guard

See merge request pleroma/pleroma!3557
2021-12-07 16:55:01 +00:00
lain e219e504ce Merge branch 'mix-lock' into 'develop'
Run `mix deps.get`

See merge request pleroma/pleroma!3556
2021-12-07 16:45:03 +00:00
Alex Gleason ab5dee84bf
Run mix deps.get 2021-12-07 10:03:31 -05:00
Finn Behrens 8af53101fb move result into with guard 2021-12-07 09:18:53 +01:00
Alex Gleason d9349bc52f
Transmogrifier: test fix_attachments/1 2021-12-07 01:10:47 -05:00
lain 613f55b078 Merge branch 'benchmark' into 'develop'
Fix benchmarks

See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
sadposter 31b4acca61 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-12-06 20:25:54 +00:00
marcin mikołajczak c96e52b88c Add 'notifying' to relationship for compatibility with Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:24:12 +01:00
marcin mikołajczak 3892bd353b Add test for following with subscription
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:15:03 +01:00
lain ab60c0c6c2 Merge branch 'optimisation/deactivated-subquery' into 'develop'
Make deactivated user check into a subquery

Closes #2792

See merge request pleroma/pleroma!3554
2021-12-06 19:55:52 +00:00
marcin mikołajczak 64a4c147b1 MastoAPI: accept notify param in follow request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 19:36:58 +01:00
sadposter 6a6260f64e re-enable deactivated check 2021-12-06 12:03:16 +00:00
FloatingGhost db46913dcc make linter happy 2021-12-06 11:50:51 +00:00
FloatingGhost cd8bdbc761 Make deactivated user check into a subquery
Fixes #2792
2021-12-06 11:44:17 +00:00
sadposter b63dd6a5a2 don't track vmargs 2021-12-06 10:23:02 +00:00
sadposter f8d97a07b9 remove vmargs 2021-12-06 10:22:39 +00:00