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.
3 years ago
2e2fb5f802
Merge branch 'ci-dont-retry' into 'develop'
...
GitLab CI: don't retry failed jobs
See merge request pleroma/pleroma!3574
3 years ago
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
3 years ago
de006443f0
MastoAPI: Profile directory
3 years ago
0eb6e858f7
Merge branch 'notice-routes' into 'develop'
...
Add notice compatibility routes for other frontends
Closes #1785
See merge request pleroma/pleroma!3402
3 years ago
cac4ed5eb0
GitLab CI: don't retry failed jobs
3 years ago
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
3 years ago
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
3 years ago
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
b4291bce8a
Merge branch 'remote-follow-api' into 'develop'
...
remote_interaction API endpoint
See merge request pleroma/pleroma!3545
3 years ago
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
1fa616638b
Merge branch 'warnings-as-errors' into 'develop'
...
Enable :warnings_as_errors for CI only
See merge request pleroma/pleroma!3474
3 years ago
2caade10df
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
3 years ago
87871ac857
Add initial Nodeinfo document
3 years ago
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
3 years ago
05c7a14101
Merge branch 'moderators' into 'develop'
...
AdminAPI: let moderators actually do things
Closes #2490
See merge request pleroma/pleroma!3480
3 years ago
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
3 years ago
2ce7dae6de
Skip erratic tests
3 years ago
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
3 years ago
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
3 years ago
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
3 years ago
e009950845
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.
3 years ago
df5359aa72
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
3 years ago
d1510c98d7
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
3 years ago
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
3 years ago
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
3 years ago
b686d68cdb
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
...
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
3 years ago
ff17884c3b
Bump alpine to 3.14
3 years ago
8376e83f61
Lint
3 years ago
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
3 years ago
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
3 years ago
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
3 years ago
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.
3 years ago
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
3 years ago
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
3 years ago
5660bee2dc
Dirty hack to make mediaproxy functional by relying on Hackney for that part
3 years ago
1863ae59fb
format
3 years ago
415d9dd6f6
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
3 years ago
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
3a9b83413e
Merge branch 'develop' into feature/elasticsearch
3 years ago
f3d9c58fef
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
742b86fdaa
format
3 years ago
9134ef5ecb
add timestamp
3 years ago
2152832780
add timestamp
3 years ago
26cae62c7f
maybe
3 years ago
9d4727598d
fix remote hashtags
3 years ago
1745606ab5
maybe
3 years ago
Lain Soykaf