Commit graph

9573 commits

Author SHA1 Message Date
Alexander Strizhakov
fbe3d3aa5f
ignore order 2020-05-13 11:38:23 +03:00
Alexander Strizhakov
2c356a4bac
don't use async with global mocks 2020-05-13 11:38:23 +03:00
Alexander Strizhakov
12635bc156
don't use global mocks in setup callbacks 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
b962b24e6f
don't run in async if tests depend on env config 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
ec27f346ee
correct order for publised in assert 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
e0944dee99
make test fail everytime 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
712055612f
don't run tests which change env in async 2020-05-13 11:38:22 +03:00
Alexander Strizhakov
4ba913d641
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
2020-05-13 11:38:21 +03:00
lain
3210e939bf Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5

See merge request pleroma/pleroma!2523
2020-05-13 07:45:35 +00:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
rinpatch
c74018e6a7 Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases

See merge request pleroma/pleroma!2520
2020-05-12 20:20:19 +00:00
rinpatch
da2fe8920d fix eldap being required for non-OTP releases 2020-05-12 23:03:21 +03:00
rinpatch
2b18b8a263 Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly

See merge request pleroma/pleroma!2519
2020-05-12 17:02:57 +00:00
href
68cca29dcf Fix typo in test 2020-05-12 18:51:10 +02:00
rinpatch
24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514
2020-05-12 16:45:46 +00:00
rinpatch
4cc71aad65 Merge branch '1748-remote-following-follower-count' into 'develop'
Transmogrifier: On incoming follow accept, update follow counts.

Closes #1748

See merge request pleroma/pleroma!2515
2020-05-12 16:44:58 +00:00
href
e6d8cacf2d Expand and authorize streams in Streamer directly 2020-05-12 18:04:47 +02:00
lain
fdc9ac8897 Merge branch 'otp-version-update-suggestion' into 'develop'
Startup: suggest updating OTP when the version is too low for gun

See merge request pleroma/pleroma!2518
2020-05-12 14:53:26 +00:00
lain
be5d0a9bde Merge branch '1020-honk-announces' into 'develop'
Transmogrifier: Add tests for certain announces

Closes #1020

See merge request pleroma/pleroma!2516
2020-05-12 14:35:51 +00:00
rinpatch
8308611279 Startup: suggest updating OTP when the version is too low for gun
I've seen quite a few people wonder what to do when presented with
this error message.
2020-05-12 17:30:39 +03:00
rinpatch
d17040e997 Merge branch 'giving-up' into 'develop'
Give up for now and make gitlab retry failed jobs.

See merge request pleroma/pleroma!2517
2020-05-12 13:23:40 +00:00
lain
2f2e5fea34 Give up for now and make gitlab retry failed jobs. 2020-05-12 15:02:37 +02:00
lain
dfb90a1fd6 Transmogrifier: Add tests for certain announces 2020-05-12 12:50:48 +02:00
lain
ca31af473c Transmogrifier: On incoming follow accept, update follow counts. 2020-05-12 12:29:37 +02:00
lain
d0ba1844b0 ActivityPub: Fix non-federating blocks. 2020-05-12 10:52:46 +02:00
rinpatch
f8190aea5e Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials

See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
rinpatch
2ead4e108a Merge branch 'migration-fix-markers' into 'develop'
Markers migration: Fix migration for very large list of markers

See merge request pleroma/pleroma!2511
2020-05-11 22:13:08 +00:00
rinpatch
9b33cab06e Merge branch 'chore/gettext-update' into 'develop'
Gettext: remove english messages and update the pot file

See merge request pleroma/pleroma!2512
2020-05-11 21:52:57 +00:00
rinpatch
952c6b29a1 Gettext: remove english messages and update the pot file
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
2020-05-12 00:40:13 +03:00
lain
f6aa0b4a07 Migration: Fix typo 2020-05-11 22:03:29 +02:00
lain
f71376e30e Migration: Enum.chunk is deprecated. 2020-05-11 22:00:01 +02:00
lain
d8dd945a03 Markers migration: Fix migration for very large list of markers 2020-05-11 21:52:47 +02:00
rinpatch
768c18facb Merge branch 'fix/streamer-timeout' into 'develop'
Fix streamer timeout

Closes #1735 and #1753

See merge request pleroma/pleroma!2509
2020-05-11 17:07:55 +00:00
href
e2b15e8ad3 Fix streamer timeout (closes #1753).
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +02:00
lain
e432314105 Merge branch '1439-favorite-deletion' into 'develop'
SideEffects test: Add test for favorite deletion.

Closes #1439

See merge request pleroma/pleroma!2508
2020-05-11 13:58:18 +00:00
lain
679afb2de4 SideEffects test: Add test for favorite deletion. 2020-05-11 15:38:19 +02:00
rinpatch
79cd723a1e Merge branch '1204-object-pruning-deletion' into 'develop'
Deletion: Handle the case of pruned objects.

Closes #1204

See merge request pleroma/pleroma!2507
2020-05-11 13:31:11 +00:00
lain
5367a00257 Deletion: Handle the case of pruned objects. 2020-05-11 15:06:23 +02:00
lain
84bb116ae3 Merge branch 'descriptions-fix' into 'develop'
copy/paste fix for descriptions

See merge request pleroma/pleroma!2504
2020-05-11 08:03:09 +00:00
Alexander Strizhakov
da6a38d205
copy/paste fix for descriptions 2020-05-11 09:35:20 +03:00
lain
7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened

See merge request pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
rinpatch
b3e6953d23 Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
insert skeletons migration: fix for non-local locals

Closes #1746

See merge request pleroma/pleroma!2502
2020-05-09 21:52:00 +00:00
rinpatch
0ad89762a1 insert skeletons migration: fix for non-local locals
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.

In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx

Closes #1746
2020-05-09 22:07:35 +03:00
rinpatch
d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
PleromaFE bundle dropping requirement for embedded account relationships

See merge request pleroma/pleroma!2494
2020-05-09 15:30:39 +00:00
rinpatch
5e1d994785 Merge branch 'fix/eldap-otp' into 'develop'
include eldap in OTP releases

Closes #1313

See merge request pleroma/pleroma!2501
2020-05-09 12:18:44 +00:00
rinpatch
b6d1bcc55d include eldap in OTP releases
Closes #1313
2020-05-09 15:17:12 +03:00
lain
c962c6afb3 Merge branch 'fix/healthcheck-total-alloc' into 'develop'
healthcheck: report real amount of memory allocated by beam

See merge request pleroma/pleroma!2499
2020-05-09 08:10:56 +00:00
rinpatch
30eaef9d61 healthcheck: report real amount of memory allocated by beam
as opposed to memory currently in use
2020-05-08 23:57:47 +03:00
rinpatch
df82ee4179 Merge branch 'chore/changelog-sync' into 'develop'
CHANGELOG.md: Add entries from 2.0.3

See merge request pleroma/pleroma!2498
2020-05-08 20:56:16 +00:00
rinpatch
f4d50fbd81 CHANGELOG.md: Add entries from 2.0.3 2020-05-08 23:54:16 +03:00