Lain Soykaf
ac3b503721
CI: Fix the broken tasks.
2021-12-26 18:54:54 +01:00
Lain Soykaf
c52390a7d9
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.
2021-12-26 18:05:42 +01:00
lain
3b8eaadb0d
Merge branch 'erratic' into 'develop'
...
CI: Start testing erratic test again
See merge request pleroma/pleroma!3575
2021-12-26 16:35:09 +00:00
Lain Soykaf
7ed2258979
Update changelog
2021-12-26 17:00:09 +01:00
Lain Soykaf
4cf03046f5
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:57:17 +01:00
Lain Soykaf
6efbd08854
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:41:17 +01:00
Lain Soykaf
e8e8d2262e
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.
2021-12-26 16:17:48 +01:00
Alex Gleason
2e2fb5f802
Merge branch 'ci-dont-retry' into 'develop'
...
GitLab CI: don't retry failed jobs
See merge request pleroma/pleroma!3574
2021-12-26 02:40:26 +00:00
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
2021-12-26 02:35:17 +00:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
0eb6e858f7
Merge branch 'notice-routes' into 'develop'
...
Add notice compatibility routes for other frontends
Closes #1785
See merge request pleroma/pleroma!3402
2021-12-26 02:33:28 +00:00
Alex Gleason
cac4ed5eb0
GitLab CI: don't retry failed jobs
2021-12-25 20:15:21 -06:00
Alex Gleason
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
2021-12-25 20:11:14 -06:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
Alex Gleason
b4291bce8a
Merge branch 'remote-follow-api' into 'develop'
...
remote_interaction API endpoint
See merge request pleroma/pleroma!3545
2021-12-25 01:32:47 +00:00
marcin mikołajczak
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-25 00:52:02 +01:00
Alex Gleason
1fa616638b
Merge branch 'warnings-as-errors' into 'develop'
...
Enable :warnings_as_errors for CI only
See merge request pleroma/pleroma!3474
2021-12-23 16:19:57 +00:00
Alex Gleason
2caade10df
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
2021-12-23 16:01:03 +00:00
87871ac857
Add initial Nodeinfo document
2021-12-23 16:01:02 +00:00
Alex Gleason
d9746ae4cb
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
2021-12-23 16:00:16 +00:00
Alex Gleason
05c7a14101
Merge branch 'moderators' into 'develop'
...
AdminAPI: let moderators actually do things
Closes #2490
See merge request pleroma/pleroma!3480
2021-12-22 16:37:35 +00:00
Alex Gleason
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
2021-12-22 04:14:31 +00:00
Alex Gleason
2ce7dae6de
Skip erratic tests
2021-12-21 22:04:15 -06:00
Alex Gleason
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
2021-12-19 12:55:36 -06:00
Alex Gleason
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
2021-12-19 18:51:41 +00:00
Alex Gleason
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
2021-12-19 18:18:59 +00:00
Ivan Tashkinov
e009950845
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.
2021-12-19 20:45:28 +03:00
Alex Gleason
df5359aa72
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
2021-12-19 17:36:25 +00:00
Alex Gleason
d1510c98d7
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
2021-12-19 17:35:50 +00:00
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
Alex Gleason
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
2021-12-19 11:33:10 -06:00
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
Alex Gleason
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
2021-12-19 17:30:52 +00:00
lain
b686d68cdb
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
...
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
2021-12-18 15:04:55 +00:00
Tusooa Zhu
ff17884c3b
Bump alpine to 3.14
2021-12-17 18:03:06 -05:00
Tusooa Zhu
8376e83f61
Lint
2021-12-17 16:52:50 -05:00
Tusooa Zhu
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
2021-12-17 16:47:48 -05:00
Tusooa Zhu
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17 16:44:22 -05:00
Tusooa Zhu
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17 14:44:28 -05:00
Tusooa Zhu
3d41ccc47b
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.
2021-12-17 14:17:51 -05:00
lain
8cfd527589
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
2021-12-17 14:35:01 +00:00
31b9034a27
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
2021-12-17 14:15:44 +00:00
5660bee2dc
Dirty hack to make mediaproxy functional by relying on Hackney for that part
2021-12-16 11:36:58 -06:00
1863ae59fb
format
2021-12-16 16:13:48 +00:00
415d9dd6f6
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
2021-12-16 16:13:41 +00:00
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-16 16:10:08 +00:00
3a9b83413e
Merge branch 'develop' into feature/elasticsearch
2021-12-16 16:07:15 +00:00
f3d9c58fef
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-16 16:07:00 +00:00
