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
FloatingGhost [Thu, 16 Dec 2021 16:05:18 +0000 (16:05 +0000)]
add timestamp
FloatingGhost [Thu, 16 Dec 2021 15:58:56 +0000 (15:58 +0000)]
add timestamp
FloatingGhost [Thu, 16 Dec 2021 15:20:22 +0000 (15:20 +0000)]
maybe
FloatingGhost [Thu, 16 Dec 2021 15:09:36 +0000 (15:09 +0000)]
fix remote hashtags
FloatingGhost [Thu, 16 Dec 2021 15:20:22 +0000 (15:20 +0000)]
maybe
FloatingGhost [Thu, 16 Dec 2021 15:09:36 +0000 (15:09 +0000)]
fix remote hashtags
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
sadposter [Wed, 15 Dec 2021 11:05:30 +0000 (11:05 +0000)]
don't try indexing non-people
sadposter [Wed, 15 Dec 2021 11:05:30 +0000 (11:05 +0000)]
don't try indexing non-people
FloatingGhost [Wed, 15 Dec 2021 10:57:47 +0000 (10:57 +0000)]
re-add fetching by url
FloatingGhost [Wed, 15 Dec 2021 10:57:47 +0000 (10:57 +0000)]
re-add fetching by url
sadposter [Tue, 14 Dec 2021 15:02:11 +0000 (15:02 +0000)]
fix empty queries returning 50 results
sadposter [Tue, 14 Dec 2021 14:48:24 +0000 (14:48 +0000)]
extra cool
sadposter [Tue, 14 Dec 2021 15:02:11 +0000 (15:02 +0000)]
fix empty queries returning 50 results
sadposter [Tue, 14 Dec 2021 14:48:24 +0000 (14:48 +0000)]
extra cool
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts
FloatingGhost [Tue, 14 Dec 2021 14:28:15 +0000 (14:28 +0000)]
merge
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation
sadposter [Tue, 14 Dec 2021 14:16:21 +0000 (14:16 +0000)]
filter by user type
sadposter [Tue, 14 Dec 2021 14:01:09 +0000 (14:01 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation
FloatingGhost [Tue, 14 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Search through users and hashtags as well
FloatingGhost [Tue, 14 Dec 2021 12:37:10 +0000 (12:37 +0000)]
add hashtag indexing
FloatingGhost [Mon, 13 Dec 2021 20:27:35 +0000 (20:27 +0000)]
add user import
FloatingGhost [Mon, 13 Dec 2021 20:15:17 +0000 (20:15 +0000)]
add mappings
FloatingGhost [Tue, 14 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Search through users and hashtags as well
FloatingGhost [Tue, 14 Dec 2021 12:37:10 +0000 (12:37 +0000)]
add hashtag indexing
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body
FloatingGhost [Mon, 13 Dec 2021 20:27:35 +0000 (20:27 +0000)]
add user import
FloatingGhost [Mon, 13 Dec 2021 20:15:17 +0000 (20:15 +0000)]
add mappings
Alex Gleason [Mon, 13 Dec 2021 04:50:07 +0000 (22:50 -0600)]
Search: limit number of results
sadposter [Sun, 12 Dec 2021 20:01:07 +0000 (20:01 +0000)]
fix buggos
FloatingGhost [Sun, 12 Dec 2021 19:40:31 +0000 (19:40 +0000)]
fully reference es
FloatingGhost [Sun, 12 Dec 2021 19:40:05 +0000 (19:40 +0000)]
fix multi-after-transaction
FloatingGhost [Sun, 12 Dec 2021 19:39:07 +0000 (19:39 +0000)]
pipeline it
sadposter [Sun, 12 Dec 2021 19:31:47 +0000 (19:31 +0000)]
fix bug in inbound
sadposter [Sun, 12 Dec 2021 18:25:20 +0000 (18:25 +0000)]
enforce visibility
sadposter [Sun, 12 Dec 2021 20:01:07 +0000 (20:01 +0000)]
fix buggos
FloatingGhost [Sun, 12 Dec 2021 19:40:31 +0000 (19:40 +0000)]
fully reference es
FloatingGhost [Sun, 12 Dec 2021 19:40:05 +0000 (19:40 +0000)]
fix multi-after-transaction
FloatingGhost [Sun, 12 Dec 2021 19:39:07 +0000 (19:39 +0000)]
pipeline it
sadposter [Sun, 12 Dec 2021 19:31:47 +0000 (19:31 +0000)]
fix bug in inbound
sadposter [Sun, 12 Dec 2021 18:25:20 +0000 (18:25 +0000)]
enforce visibility
sadposter [Sun, 12 Dec 2021 17:39:44 +0000 (17:39 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
floatingghost [Sun, 12 Dec 2021 17:37:27 +0000 (17:37 +0000)]
Merge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop
Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma/pulls/1