alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,042 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

12042 Commits

Author SHA1 Message Date
lain 6706cdce65 Merge branch 'openapi/suggestions' into 'develop' 
Add OpenAPI spec for SuggestionController

See merge request pleroma/pleroma!2525
 2020-05-13 10:34:04 +00:00
Egor Kislitsyn bcadbf964a
Add OpenAPI spec for SuggestionController 2020-05-13 14:15:24 +04:00
Ivan Tashkinov 33b798425f [#2456] Post-merge fix. 2020-05-13 12:50:52 +03:00
Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs
 2020-05-13 12:42:36 +03:00
lain 156c8a5088 Merge branch 'openapi/statuses' into 'develop' 
Add OpenAPI spec for StatusController

See merge request pleroma/pleroma!2521
 2020-05-13 09:34:30 +00:00
lain 1307d6ca3c Merge branch 'openapi/timelines' into 'develop' 
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
 2020-05-13 09:33:37 +00:00
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 a5ccb5b0b1 Merge branch 'release/2.0.5' into 'stable' 
Release/2.0.5

See merge request pleroma/secteam/pleroma!4
 2020-05-13 08:12:09 +00: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
Egor Kislitsyn 79ad12064d
Fix format 2020-05-13 01:59:17 +04:00
rinpatch 2906cbbd40 mix.exs: bump to 2.0.5 2020-05-13 00:33:38 +03:00
rinpatch 6430df851d CHANGELOG.md: add 2.0.5 entry 2020-05-13 00:33:38 +03:00
lain 3f13437a9c User: Truncate bios when updating a remote user. 2020-05-13 00:33:38 +03:00
rinpatch 3a63f84c45 pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 2020-05-13 00:33:38 +03:00
lain a8abf1ada6 ActivityPub: Fix non-federating blocks. 2020-05-13 00:33:30 +03:00
minibikini cb1a3e196c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:43 +00:00
minibikini 5a2333925c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:36 +00:00
minibikini 822e9c09aa Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:23:21 +00:00
minibikini 40646a7e0e Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:14:52 +00:00
minibikini 0bb164a3e1 Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:12:22 +00:00
minibikini 648cc0d72d Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex 2020-05-12 21:09:26 +00:00
Egor Kislitsyn 7803a85d2c
Add OpenAPI spec for StatusController 2020-05-13 00:25:21 +04: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
Stephanie Wilde-Hobbs a2fcfc78c9
Filter config descriptions by config whitelist 2020-05-12 21:07:33 +01:00
lain ec5e057802 Transmogrifier: On incoming follow accept, update follow counts. 2020-05-12 23:05:57 +03:00
rinpatch b5b675fa14 fix eldap being required for non-OTP releases 2020-05-12 23:05:31 +03:00
rinpatch da2fe8920d fix eldap being required for non-OTP releases 2020-05-12 23:03:21 +03:00
href 40d0775c7f Reorder alias 2020-05-12 21:27:54 +02:00
href 37c2deb3dd Expand and authorize streams in Streamer directly (backport from !2519) 2020-05-12 21:14:46 +02:00
Ivan Tashkinov bfb48e3db6 [#2456] OpenAPI: added `embed_relationships` param definition. 2020-05-12 20:55:01 +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
Ivan Tashkinov 63a1a82f38 [#2456] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching. 2020-05-12 19:14:35 +03:00
Stephanie Wilde-Hobbs 620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01: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 c0ea5c60e4 ChatController: Don't return chats for user you've blocked. 2020-05-12 16:43:04 +02: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