Alex Gleason [Mon, 27 Dec 2021 18:27:13 +0000 (18:27 +0000)]
Merge branch 'finch' into 'develop'
Finch support
See merge request pleroma/pleroma!3565
Alex Gleason [Mon, 27 Dec 2021 17:41:28 +0000 (17:41 +0000)]
Merge branch 'tag-gun-erratic' into 'develop'
ConnectionPoolTest: tag erratic test
See merge request pleroma/pleroma!3580
Alex Gleason [Mon, 27 Dec 2021 17:31:15 +0000 (11:31 -0600)]
Merge remote-tracking branch 'origin/develop' into finch
Alex Gleason [Mon, 27 Dec 2021 17:27:25 +0000 (11:27 -0600)]
ConnectionPoolTest: tag erratic test
Alex Gleason [Mon, 27 Dec 2021 17:06:22 +0000 (17:06 +0000)]
Merge branch 'restricted-moderators' into 'develop'
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
Alex Gleason [Mon, 27 Dec 2021 16:39:59 +0000 (10:39 -0600)]
EnsureStaffPrivilegedPlug: add tests
Alex Gleason [Mon, 27 Dec 2021 15:41:06 +0000 (15:41 +0000)]
Merge branch 'log-slow-queries' into 'develop'
Log slow Ecto queries
See merge request pleroma/pleroma!3553
Ivan Tashkinov [Mon, 27 Dec 2021 06:13:31 +0000 (09:13 +0300)]
Made slow queries logging disabled by default.
Alibek Omarov [Mon, 27 Dec 2021 00:12:32 +0000 (03:12 +0300)]
Fix lint errors
Alibek Omarov [Sun, 26 Dec 2021 23:57:54 +0000 (02:57 +0300)]
API: fix duplicate :get_password_token route
Alibek Omarov [Sun, 26 Dec 2021 23:28:09 +0000 (02:28 +0300)]
API: show info about privileged staff in instance metadata
Alibek Omarov [Sun, 26 Dec 2021 23:27:48 +0000 (02:27 +0300)]
API: optionally restrict moderators from accessing sensitive data
Ivan Tashkinov [Sun, 26 Dec 2021 19:49:00 +0000 (22:49 +0300)]
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
lain [Sun, 26 Dec 2021 16:35:09 +0000 (16:35 +0000)]
Merge branch 'erratic' into 'develop'
CI: Start testing erratic test again
See merge request pleroma/pleroma!3575
Lain Soykaf [Sun, 26 Dec 2021 16:00:09 +0000 (17:00 +0100)]
Update changelog
Lain Soykaf [Sun, 26 Dec 2021 15:57:17 +0000 (16:57 +0100)]
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
Lain Soykaf [Sun, 26 Dec 2021 15:41:17 +0000 (16:41 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
Lain Soykaf [Sun, 26 Dec 2021 15:14:56 +0000 (16:14 +0100)]
CI: Start testing erratic test again
Erratic tests are now ran in their own task, so we don't block
normal testing. The runtime is under a minute, so even if this one
has to be retried, it shouldn't take forever.
Alex Gleason [Sun, 26 Dec 2021 02:40:26 +0000 (02:40 +0000)]
Merge branch 'ci-dont-retry' into 'develop'
GitLab CI: don't retry failed jobs
See merge request pleroma/pleroma!3574
Alex Gleason [Sun, 26 Dec 2021 02:35:17 +0000 (02:35 +0000)]
Merge branch 'profile-directory' into 'develop'
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
marcin mikołajczak [Sun, 26 Dec 2021 02:35:17 +0000 (02:35 +0000)]
MastoAPI: Profile directory
Alex Gleason [Sun, 26 Dec 2021 02:33:28 +0000 (02:33 +0000)]
Merge branch 'notice-routes' into 'develop'
Add notice compatibility routes for other frontends
Closes #1785
See merge request pleroma/pleroma!3402
Alex Gleason [Sun, 26 Dec 2021 02:15:21 +0000 (20:15 -0600)]
GitLab CI: don't retry failed jobs
Alex Gleason [Sun, 26 Dec 2021 02:11:14 +0000 (20:11 -0600)]
Pleroma.Web.base_url() --> Endpoint.url()
Alex Gleason [Sun, 26 Dec 2021 01:57:53 +0000 (19:57 -0600)]
Merge remote-tracking branch 'origin/develop' into notice-routes
Alex Gleason [Sat, 25 Dec 2021 01:41:12 +0000 (01:41 +0000)]
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
Alex Gleason [Sat, 25 Dec 2021 01:34:27 +0000 (01:34 +0000)]
Merge branch 'account-subscriptions' into 'develop'
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
Alex Gleason [Sat, 25 Dec 2021 01:32:47 +0000 (01:32 +0000)]
Merge branch 'remote-follow-api' into 'develop'
remote_interaction API endpoint
See merge request pleroma/pleroma!3545
marcin mikołajczak [Fri, 24 Dec 2021 23:52:02 +0000 (00:52 +0100)]
Merge remote-tracking branch 'origin/develop' into remote-follow-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Alex Gleason [Thu, 23 Dec 2021 16:19:57 +0000 (16:19 +0000)]
Merge branch 'warnings-as-errors' into 'develop'
Enable :warnings_as_errors for CI only
See merge request pleroma/pleroma!3474
Alex Gleason [Thu, 23 Dec 2021 16:01:03 +0000 (16:01 +0000)]
Merge branch 'add-nodeinfo-doc' into 'develop'
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
Hakaba Hitoyo [Thu, 23 Dec 2021 16:01:02 +0000 (16:01 +0000)]
Add initial Nodeinfo document
Alex Gleason [Thu, 23 Dec 2021 16:00:16 +0000 (16:00 +0000)]
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
Alex Gleason [Wed, 22 Dec 2021 16:37:35 +0000 (16:37 +0000)]
Merge branch 'moderators' into 'develop'
AdminAPI: let moderators actually do things
Closes #2490
See merge request pleroma/pleroma!3480
Alex Gleason [Wed, 22 Dec 2021 04:14:31 +0000 (04:14 +0000)]
Merge branch 'erratic-tests' into 'develop'
Skip erratic tests
See merge request pleroma/pleroma!3572
Alex Gleason [Wed, 22 Dec 2021 04:04:15 +0000 (22:04 -0600)]
Skip erratic tests
Alex Gleason [Sun, 19 Dec 2021 18:55:36 +0000 (12:55 -0600)]
Merge remote-tracking branch 'origin/develop' into moderators
Alex Gleason [Sun, 19 Dec 2021 18:51:41 +0000 (18:51 +0000)]
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
Alex Gleason [Sun, 19 Dec 2021 18:18:59 +0000 (18:18 +0000)]
Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
Ivan Tashkinov [Sun, 19 Dec 2021 17:35:00 +0000 (20:35 +0300)]
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.
Alex Gleason [Sun, 19 Dec 2021 17:36:25 +0000 (17:36 +0000)]
Merge branch 'replies-count' into 'develop'
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
Alex Gleason [Sun, 19 Dec 2021 17:35:50 +0000 (17:35 +0000)]
Merge branch 'link-headers-chats' into 'develop'
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
Alex Gleason [Sun, 19 Dec 2021 17:35:14 +0000 (17:35 +0000)]
Merge branch 'live-dashboard' into 'develop'
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
Alex Gleason [Sun, 19 Dec 2021 17:33:10 +0000 (11:33 -0600)]
Merge remote-tracking branch 'origin/develop' into manifest
Alex Gleason [Sun, 19 Dec 2021 17:31:17 +0000 (17:31 +0000)]
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
Alex Gleason [Sun, 19 Dec 2021 17:30:52 +0000 (17:30 +0000)]
Merge branch 'fix-search-dos' into 'develop'
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
lain [Sat, 18 Dec 2021 15:04:55 +0000 (15:04 +0000)]
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
Tusooa Zhu [Fri, 17 Dec 2021 23:00:29 +0000 (18:00 -0500)]
Bump alpine to 3.14
Tusooa Zhu [Fri, 17 Dec 2021 21:52:50 +0000 (16:52 -0500)]
Lint
Tusooa Zhu [Fri, 17 Dec 2021 21:47:48 +0000 (16:47 -0500)]
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
Tusooa Zhu [Fri, 17 Dec 2021 21:44:22 +0000 (16:44 -0500)]
Add test to ensure removed follower cease to have relationship with ex-followee
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
Tusooa Zhu [Fri, 17 Dec 2021 19:42:45 +0000 (14:42 -0500)]
Add test to ensure the blocked cease to have follow relationship to the blocker
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
Tusooa Zhu [Fri, 17 Dec 2021 19:17:51 +0000 (14:17 -0500)]
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
lain [Fri, 17 Dec 2021 14:35:01 +0000 (14:35 +0000)]
Merge branch 'verbose-emoji-loader' into 'develop'
emoji/loader.ex: be more verbose about which emoji pack config is loading now
See merge request pleroma/pleroma!3567
a1batross [Fri, 17 Dec 2021 14:15:44 +0000 (14:15 +0000)]
emoji/loader.ex: be more verbose about which emoji pack config is loading now
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
Mark Felder [Thu, 16 Dec 2021 17:36:58 +0000 (11:36 -0600)]
Dirty hack to make mediaproxy functional by relying on Hackney for that part
Alex Gleason [Thu, 16 Dec 2021 00:05:36 +0000 (19:05 -0500)]
Merge remote-tracking branch 'origin/develop' into live-dashboard
Alex Gleason [Wed, 15 Dec 2021 21:17:11 +0000 (16:17 -0500)]
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
lain [Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)]
Merge branch 'delete-account-fix' into 'develop'
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
Lain Soykaf [Wed, 15 Dec 2021 20:42:37 +0000 (15:42 -0500)]
Application: Actually start finch if it's needed
Lain Soykaf [Wed, 15 Dec 2021 18:53:09 +0000 (13:53 -0500)]
Application, dependencies: prepare for finch
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body
Alex Gleason [Mon, 13 Dec 2021 04:50:07 +0000 (22:50 -0600)]
Search: limit number of results
marcin mikołajczak [Sun, 12 Dec 2021 16:43:18 +0000 (17:43 +0100)]
Add link headers in ChatController.index2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
lain [Thu, 9 Dec 2021 16:05:06 +0000 (16:05 +0000)]
Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
lain [Thu, 9 Dec 2021 15:38:26 +0000 (15:38 +0000)]
Merge branch 'benchmark-fixes' into 'develop'
Benchmarks: fix user timeline and tags benchmarks
See merge request pleroma/pleroma!3560
Alex Gleason [Wed, 8 Dec 2021 17:54:41 +0000 (11:54 -0600)]
Benchmarks: fix user timeline and tags benchmarks
Alex Gleason [Wed, 8 Dec 2021 02:55:54 +0000 (21:55 -0500)]
VideoHandlingTest: remove nil values
Haelwenn [Tue, 7 Dec 2021 22:53:36 +0000 (22:53 +0000)]
Apply alexgleason's suggestion(s) to 1 file(s)
Alex Gleason [Tue, 7 Dec 2021 18:41:54 +0000 (13:41 -0500)]
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
Alex Gleason [Tue, 7 Dec 2021 18:35:34 +0000 (13:35 -0500)]
Fix VideoHandlingTest
lain [Tue, 7 Dec 2021 18:19:43 +0000 (18:19 +0000)]
Merge branch 'fixyfix' into 'develop'
Linting.
See merge request pleroma/pleroma!3558
Alex Gleason [Tue, 7 Dec 2021 17:59:03 +0000 (12:59 -0500)]
AttachmentValidator: ingest width and height
Lain Soykaf [Tue, 7 Dec 2021 17:12:23 +0000 (12:12 -0500)]
Linting.
lain [Tue, 7 Dec 2021 16:55:01 +0000 (16:55 +0000)]
Merge branch 'pleroma-result-1_13' into 'develop'
move result into with guard
See merge request pleroma/pleroma!3557
lain [Tue, 7 Dec 2021 16:45:03 +0000 (16:45 +0000)]
Merge branch 'mix-lock' into 'develop'
Run `mix deps.get`
See merge request pleroma/pleroma!3556
Alex Gleason [Tue, 7 Dec 2021 15:03:31 +0000 (10:03 -0500)]
Run `mix deps.get`
Finn Behrens [Tue, 7 Dec 2021 08:18:53 +0000 (09:18 +0100)]
move result into with guard
Alex Gleason [Tue, 7 Dec 2021 06:10:47 +0000 (01:10 -0500)]
Transmogrifier: test fix_attachments/1
lain [Mon, 6 Dec 2021 21:16:30 +0000 (21:16 +0000)]
Merge branch 'benchmark' into 'develop'
Fix benchmarks
See merge request pleroma/pleroma!3551
marcin mikołajczak [Mon, 6 Dec 2021 20:23:34 +0000 (21:23 +0100)]
Add 'notifying' to relationship for compatibility with Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
marcin mikołajczak [Mon, 6 Dec 2021 20:13:14 +0000 (21:13 +0100)]
Add test for following with subscription
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
lain [Mon, 6 Dec 2021 19:55:52 +0000 (19:55 +0000)]
Merge branch 'optimisation/deactivated-subquery' into 'develop'
Make deactivated user check into a subquery
Closes #2792
See merge request pleroma/pleroma!3554
marcin mikołajczak [Mon, 6 Dec 2021 17:00:58 +0000 (18:00 +0100)]
MastoAPI: accept notify param in follow request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
FloatingGhost [Mon, 6 Dec 2021 11:50:51 +0000 (11:50 +0000)]
make linter happy
FloatingGhost [Mon, 6 Dec 2021 11:44:17 +0000 (11:44 +0000)]
Make deactivated user check into a subquery
Fixes #2792
Alex Gleason [Sun, 5 Dec 2021 22:46:56 +0000 (17:46 -0500)]
Log Ecto queries > 500ms
Alex Gleason [Fri, 3 Dec 2021 21:20:54 +0000 (16:20 -0500)]
Fix benchmarks
lain [Fri, 3 Dec 2021 15:13:10 +0000 (15:13 +0000)]
Merge branch 'password-reset' into 'develop'
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
Alex Gleason [Fri, 3 Dec 2021 13:56:26 +0000 (07:56 -0600)]
Fix frontend_status_plug_test.exs
Alex Gleason [Fri, 3 Dec 2021 06:11:38 +0000 (00:11 -0600)]
Merge remote-tracking branch 'origin/develop' into password-reset
Alex Gleason [Fri, 3 Dec 2021 06:02:49 +0000 (00:02 -0600)]
Restore POST /auth/password
lain [Thu, 2 Dec 2021 16:54:28 +0000 (16:54 +0000)]
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
marcin mikołajczak [Mon, 22 Nov 2021 18:44:30 +0000 (19:44 +0100)]
remote_interaction API endpoint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
lain [Wed, 1 Dec 2021 15:49:57 +0000 (15:49 +0000)]
Merge branch 'update-hackney' into 'develop'
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
lain [Mon, 29 Nov 2021 18:08:10 +0000 (18:08 +0000)]
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'
Force pinned_objects to be empty, not null
Closes #2788
See merge request pleroma/pleroma!3548
NEETzsche [Mon, 29 Nov 2021 18:08:09 +0000 (18:08 +0000)]
Force pinned_objects to be empty, not null
a1batross [Mon, 29 Nov 2021 17:28:10 +0000 (17:28 +0000)]
Mix: upgrade Hackney to 1.18.0
Alex Gleason [Sat, 27 Nov 2021 05:10:01 +0000 (23:10 -0600)]
v2 Suggestions: return `is_suggested` through the API
Alex Gleason [Sat, 27 Nov 2021 04:45:49 +0000 (22:45 -0600)]
Instance: add v2_suggestions feature
projects / akkoma / log