FloatingGhost [Fri, 7 Jan 2022 17:21:44 +0000 (17:21 +0000)]
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
FloatingGhost [Fri, 7 Jan 2022 17:17:18 +0000 (17:17 +0000)]
add bookwyrm entity tests
FloatingGhost [Fri, 7 Jan 2022 16:51:04 +0000 (16:51 +0000)]
Add compatibility with bookwyrm's weird entities
Alex Gleason [Sun, 2 Jan 2022 15:41:56 +0000 (15:41 +0000)]
Merge branch 'change/web-push-encryption-dep' into 'develop'
Upgrade web_push_encryption to 0.3.1
See merge request pleroma/pleroma!3592
Sean King [Sun, 2 Jan 2022 04:02:09 +0000 (21:02 -0700)]
Upgrade web_push_encryption to 0.3.1
Alex Gleason [Sat, 1 Jan 2022 22:15:08 +0000 (22:15 +0000)]
Merge branch 'change/concurrent-limiter-dep' into 'develop'
Change concurrent_limiter to version 0.1.1
See merge request pleroma/pleroma!3591
Sean King [Sat, 1 Jan 2022 21:49:57 +0000 (14:49 -0700)]
Change concurrent_limiter to Hex PM version 0.1.1
Alex Gleason [Fri, 31 Dec 2021 16:40:14 +0000 (16:40 +0000)]
Merge branch 'erratic-streamer-test' into 'develop'
StreamerTest: tag erratic test
See merge request pleroma/pleroma!3590
Alex Gleason [Fri, 31 Dec 2021 16:29:50 +0000 (10:29 -0600)]
StreamerTest: tag erratic test
FloatingGhost [Thu, 30 Dec 2021 20:01:25 +0000 (20:01 +0000)]
update linkify
FloatingGhost [Thu, 30 Dec 2021 18:03:09 +0000 (18:03 +0000)]
format
FloatingGhost [Thu, 30 Dec 2021 18:03:02 +0000 (18:03 +0000)]
don't error out
FloatingGhost [Thu, 30 Dec 2021 17:47:41 +0000 (17:47 +0000)]
delete activities
FloatingGhost [Thu, 30 Dec 2021 18:05:22 +0000 (18:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
lain [Thu, 30 Dec 2021 15:53:33 +0000 (15:53 +0000)]
Merge branch 'more-efficient-ci' into 'develop'
CI: Use own package as base
See merge request pleroma/pleroma!3577
lain [Wed, 29 Dec 2021 13:06:47 +0000 (13:06 +0000)]
Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop'
Added index on [:target_id, :relationship_type] to :user_relationships
See merge request pleroma/pleroma!3588
Ivan Tashkinov [Wed, 29 Dec 2021 08:44:33 +0000 (11:44 +0300)]
`mix format`
Ivan Tashkinov [Wed, 29 Dec 2021 08:41:21 +0000 (11:41 +0300)]
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up `Notification.exclude_blockers/_`).
Alex Gleason [Tue, 28 Dec 2021 21:42:39 +0000 (21:42 +0000)]
Merge branch 'changelog' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3586
Alex Gleason [Tue, 28 Dec 2021 21:11:38 +0000 (15:11 -0600)]
Update CHANGELOG.md
Alex Gleason [Tue, 28 Dec 2021 21:00:09 +0000 (21:00 +0000)]
Merge branch 'mastodon-lookup' into 'develop'
MastoAPI: Add `GET /api/v1/accounts/lookup`
See merge request pleroma/pleroma!3584
marcin mikołajczak [Tue, 28 Dec 2021 19:02:59 +0000 (20:02 +0100)]
AccountController.lookup: skip auth
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
marcin mikołajczak [Tue, 28 Dec 2021 17:24:48 +0000 (18:24 +0100)]
AccountController.lookup: skip visibility check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
marcin mikołajczak [Tue, 28 Dec 2021 15:27:27 +0000 (16:27 +0100)]
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
marcin mikołajczak [Tue, 28 Dec 2021 15:11:17 +0000 (16:11 +0100)]
MastoAPI: Add `GET /api/v1/accounts/lookup`
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Alex Gleason [Tue, 28 Dec 2021 14:38:02 +0000 (14:38 +0000)]
Merge branch 'apps-api-endpoint' into 'develop'
Apps API endpoint
See merge request pleroma/pleroma!3583
Alex Gleason [Tue, 28 Dec 2021 00:53:11 +0000 (00:53 +0000)]
Merge branch 'ensure-staff-privileged-strict' into 'develop'
EnsureStaffPrivilegedPlug: don't let non-moderators through
See merge request pleroma/pleroma!3582
Alex Gleason [Tue, 28 Dec 2021 00:52:34 +0000 (18:52 -0600)]
PleromaAPI.AppView: add test
Alex Gleason [Tue, 28 Dec 2021 00:30:16 +0000 (18:30 -0600)]
AppController: remove unnecessary `require Logger`
Alex Gleason [Tue, 28 Dec 2021 00:29:03 +0000 (18:29 -0600)]
Apps: add test for get_user_apps/1
Alex Gleason [Tue, 28 Dec 2021 00:14:15 +0000 (18:14 -0600)]
AppController: test creating with and without a user
Alex Gleason [Tue, 28 Dec 2021 00:05:35 +0000 (18:05 -0600)]
Apps: add user_id index
Alex Gleason [Tue, 28 Dec 2021 00:01:25 +0000 (18:01 -0600)]
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
Alex Gleason [Mon, 27 Dec 2021 23:18:26 +0000 (17:18 -0600)]
EnsureStaffPrivilegedPlug: don't let non-moderators through
Alex Gleason [Mon, 27 Dec 2021 23:12:14 +0000 (23:12 +0000)]
Merge branch 'admin-fix-duplicated-endpoints' into 'develop'
AdminAPI: fix duplicated routes
See merge request pleroma/pleroma!3581
Alex Gleason [Mon, 27 Dec 2021 22:58:10 +0000 (16:58 -0600)]
AdminAPI: fix duplicated routes
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 Soykaf [Sun, 26 Dec 2021 17:54:54 +0000 (18:54 +0100)]
CI: Fix the broken tasks.
Lain Soykaf [Sun, 26 Dec 2021 17:05:42 +0000 (18:05 +0100)]
CI: Use own package as base
So we can skip updating and installing the same packages a million
times. It will still grab the hex.pm stuff -- maybe we can find a way to
avoid this, too.
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
FloatingGhost [Thu, 16 Dec 2021 16:13:48 +0000 (16:13 +0000)]
format
FloatingGhost [Thu, 16 Dec 2021 16:13:41 +0000 (16:13 +0000)]
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
FloatingGhost [Thu, 16 Dec 2021 16:10:08 +0000 (16:10 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop
FloatingGhost [Thu, 16 Dec 2021 16:07:15 +0000 (16:07 +0000)]
Merge branch 'develop' into feature/elasticsearch
FloatingGhost [Thu, 16 Dec 2021 16:07:00 +0000 (16:07 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
FloatingGhost [Thu, 16 Dec 2021 16:05:33 +0000 (16:05 +0000)]
format
projects / akkoma / log