bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14530 commits 1 branch 0 tags 292 MiB
Commit graph

14530 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
16745b8e91
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-24 12:28:23 -05:00
Ilja
6ba93c2cb3 Fix test get_user_apps/1 
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.

When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.

The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.

AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
 2022-02-22 18:56:26 +01:00
lain
d91e9cee04 Merge branch 'unicode-14.0-backend' into 'develop' 
Unicode 14 Support

See merge request pleroma/pleroma!3633
 2022-02-21 19:38:52 +00:00
Sam Therapy
061cb749cd
Add unicode 14 support 
and add a test with a unicode 14 emoji
 2022-02-21 12:28:33 -06:00
marcin mikołajczak
644b7e614e Allow submitting an array of rule_ids to /api/v1/reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-21 13:37:13 +01:00
marcin mikołajczak
9747233375 Add mastodon admin API routes for report assigning 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-18 18:06:24 +01:00
marcin mikołajczak
db77571319 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 2022-02-18 17:25:52 +01:00
marcin mikołajczak
05fb8229b9 Allow assigning users to reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-18 17:23:57 +01:00
marcin mikołajczak
1cbe512d4e Merge branch 'mastodon-admin-api' into 'develop' 
MastoAPI: /api/v1/admin/accounts, /api/v1/admin/reports

See merge request soapbox-pub/soapbox-be!95
 2022-02-17 15:02:19 +00:00
marcin mikołajczak
e4677e212c Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-17 15:28:25 +01:00
Alex Gleason
0a6c52fecb Merge branch 'configuration' into 'develop' 
Add `configuration` field to /api/v1/instance

See merge request soapbox-pub/soapbox-be!98
 2022-02-16 20:24:48 +00:00
marcin mikołajczak
892f75e9d7 InstanceControllerTest: Add configuration test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-16 20:41:36 +01:00
Alex Gleason
391539d7a2 Merge branch 'readme' into 'develop' 
Update README for soapbox-be

See merge request soapbox-pub/soapbox-be!99
 2022-02-16 15:41:25 +00:00
Alex Gleason
dcb65ab1af
Update README for soapbox-be 2022-02-16 09:26:53 -06:00
marcin mikołajczak
02f02cb6df Add configuration field to /api/v1/instance 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-15 22:03:49 +01:00
Alex Gleason
759338ac09 Fix screenshot in README 2022-02-15 19:25:53 +00:00
Alex Gleason
c73404ade8 Merge branch 'emit-move' into 'develop' 
Implement moving account

See merge request soapbox-pub/soapbox-be!97
 2022-02-14 20:49:10 +00:00
marcin mikołajczak
fbb159dd47 Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-13 23:18:55 +01:00
marcin mikołajczak
5a4a7e775b some cleanup, reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-13 17:58:24 +01:00
marcin mikołajczak
ca5ee8f0bf MastoAPI: /api/v1/admin/reports 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-12 21:52:21 +01:00
marcin mikołajczak
48e87be7de Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api 2022-02-11 22:53:22 +01:00
marcin mikołajczak
6836361398 MastoAPI: /api/v1/admin/accounts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-11 22:36:00 +01:00
marcin mikołajczak
a80852ba05 Merge branch 'instance-rules' into 'develop' 
Instance rules

See merge request soapbox-pub/soapbox!93
 2022-02-08 19:20:44 +00:00
marcin mikołajczak
1f9317100e Instance rules: Duplicate rule_controller_test, hope nobody notices 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-08 20:06:32 +01:00
marcin mikołajczak
1ffed59ae9 Instance rules: Use render_many 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-07 23:41:41 +01:00
Alex Gleason
1abc29bf3a Merge branch 'default-hellthread' into 'develop' 
Add HellthreadPolicy by default

See merge request soapbox-pub/soapbox!91
 2022-02-07 05:48:32 +00:00
Alex Gleason
44723db71a Merge branch 'develop' into 'default-hellthread' 
# Conflicts:
#   config/soapbox.exs
 2022-02-07 05:33:38 +00:00
Alex Gleason
bdf3f19396 Merge branch 'merge-upstream' into 'develop' 
Max media attachment count

See merge request soapbox-pub/soapbox!94
 2022-02-06 18:56:50 +00:00
Alex Gleason
a3c77c4eaa
Soapbox: limit 20 media attachments by default 2022-02-06 12:42:29 -06:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-06 12:31:53 -06:00
Alex Gleason
fa8e2ffa3f Merge branch 'max_media_attachments' into 'develop' 
Allow specifying max media attachment count

Closes #2665

See merge request pleroma/pleroma!3630
 2022-02-06 18:25:14 +00:00
marcin mikołajczak
e473bcf7a0 Max media attachment count 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-06 17:41:15 +01:00
marcin mikołajczak
d8a817ae8e Add GET /api/v1/instance/rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-05 19:13:30 +01:00
marcin mikołajczak
6d18e6595c Instance rules 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-05 18:07:04 +01:00
Alex Gleason
309e21a50f Merge branch 'merge-upstream' into 'develop' 
Merge upstream (test improvements)

See merge request soapbox-pub/soapbox!92
 2022-02-02 20:12:17 +00:00
Alex Gleason
cc18296627
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-02 13:57:47 -06:00
Alex Gleason
64b136e11e
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream 2022-02-02 13:57:43 -06:00
Alex Gleason
60deddb7e5 Merge branch 'fix-tests-warn' into 'develop' 
Fix tests matching on "warn"

See merge request pleroma/pleroma!3629
 2022-02-02 19:57:03 +00:00
Alex Gleason
7c044a1841
FilterControllerTest: tag erratic test 2022-02-02 13:10:39 -06:00
Alex Gleason
6d710a0f7e
Merge remote-tracking branch 'origin/develop' into quote-post 2022-02-02 12:50:03 -06:00
Haelwenn (lanodan) Monnier
d1cc9e4eaf
Fix tests matching on "warn" 
Moving it to "warning" would break tests on 1.12.x
 2022-02-02 12:45:26 -06:00
Alex Gleason
71c80204c9 Merge branch 'roadhouse' into 'develop' 
Roadhouse debugging

See merge request pleroma/pleroma!3628
 2022-02-02 18:44:09 +00:00
Alex Gleason
bd81af731e
Tag erratic test 2022-02-02 12:29:53 -06:00
Alex Gleason
2d77976305
Add tests for mismatched context in replies 2022-02-02 12:19:35 -06:00
Alex Gleason
5a4e3aa715
Test that a Create/Note from Roadhouse validates 2022-02-02 11:02:23 -06:00
Alex Gleason
61dfeca1cc
Test that a Note from Roadhouse validates 2022-02-02 10:38:30 -06:00
Alex Gleason
94838fc10a
Add HellthreadPolicy by default 2022-02-01 15:28:53 -06:00
Alex Gleason
d683d6d4f3 Merge branch 'merge-upstream' into 'develop' 
Birthdays: Fix outgoing federation of birth dates

See merge request soapbox-pub/soapbox!89
 2022-02-01 15:47:43 +00:00
Alex Gleason
a87b7b3046
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-01 09:31:58 -06:00
Alex Gleason
de99fd7804 Merge branch 'birth-dates' into 'develop' 
Birthdays: Fix outgoing federation of birth dates

See merge request pleroma/pleroma!3626
 2022-02-01 15:21:34 +00:00