summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-13Add `pleroma_internal` as an internal fieldAlex Gleason
2020-05-13Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
Translations update from Weblate See merge request pleroma/pleroma!2529
2020-05-13Translated using Weblate (French)Haelwenn (lanodan) Monnier
Currently translated at 100.0% (90 of 90 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
2020-05-13Merge branch 'fix/1742-random-failing-tests' into 'develop'lain
Fix sporadically failing tests See merge request pleroma/pleroma!2524
2020-05-13Merge branch 'openapi/suggestions' into 'develop'lain
Add OpenAPI spec for SuggestionController See merge request pleroma/pleroma!2525
2020-05-13Add OpenAPI spec for SuggestionControllerEgor Kislitsyn
2020-05-13Merge branch 'openapi/statuses' into 'develop'lain
Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506
2020-05-13ignore orderAlexander Strizhakov
2020-05-13don't use async with global mocksAlexander Strizhakov
2020-05-13don't use global mocks in setup callbacksAlexander Strizhakov
2020-05-13don't run in async if tests depend on env configAlexander Strizhakov
2020-05-13correct order for publised in assertAlexander Strizhakov
2020-05-13make test fail everytimeAlexander Strizhakov
2020-05-13don't run tests which change env in asyncAlexander Strizhakov
2020-05-13{:error, :enoent} s3 fixAlexander Strizhakov
s3 tests were executed before temp file was uploaded
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
Upgrade Comeonin to v5 See merge request pleroma/pleroma!2523
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-13Fix formatEgor Kislitsyn
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-13Add OpenAPI spec for StatusControllerEgor Kislitsyn
2020-05-12Merge branch 'fix/eldap-required' into 'develop'rinpatch
fix eldap being required for non-OTP releases See merge request pleroma/pleroma!2520
2020-05-12fix eldap being required for non-OTP releasesrinpatch
2020-05-12Merge branch 'streamer-get-topic' into 'develop'rinpatch
Expand and authorize streams in Streamer directly See merge request pleroma/pleroma!2519
2020-05-12Fix typo in testhref
2020-05-12Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'rinpatch
ActivityPub: Fix non-federating blocks. Closes #1757 See merge request pleroma/pleroma!2514
2020-05-12Merge branch '1748-remote-following-follower-count' into 'develop'rinpatch
Transmogrifier: On incoming follow accept, update follow counts. Closes #1748 See merge request pleroma/pleroma!2515
2020-05-12Expand and authorize streams in Streamer directlyhref
2020-05-12Merge branch 'otp-version-update-suggestion' into 'develop'lain
Startup: suggest updating OTP when the version is too low for gun See merge request pleroma/pleroma!2518
2020-05-12Merge branch '1020-honk-announces' into 'develop'lain
Transmogrifier: Add tests for certain announces Closes #1020 See merge request pleroma/pleroma!2516
2020-05-12Startup: suggest updating OTP when the version is too low for gunrinpatch
I've seen quite a few people wonder what to do when presented with this error message.
2020-05-12Merge branch 'giving-up' into 'develop'rinpatch
Give up for now and make gitlab retry failed jobs. See merge request pleroma/pleroma!2517
2020-05-12Give up for now and make gitlab retry failed jobs.lain
2020-05-12Transmogrifier: Add tests for certain announceslain
2020-05-12Transmogrifier: On incoming follow accept, update follow counts.lain
2020-05-12ActivityPub: Fix non-federating blocks.lain
2020-05-11Merge branch 'fix/issue-1676' into 'develop'rinpatch
[#1676] fixed 'source' object in verify_credentials See merge request pleroma/pleroma!2492
2020-05-11Merge branch 'migration-fix-markers' into 'develop'rinpatch
Markers migration: Fix migration for very large list of markers See merge request pleroma/pleroma!2511
2020-05-11Merge branch 'chore/gettext-update' into 'develop'rinpatch
Gettext: remove english messages and update the pot file See merge request pleroma/pleroma!2512
2020-05-12Gettext: remove english messages and update the pot filerinpatch
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-11Migration: Fix typolain
2020-05-11Migration: Enum.chunk is deprecated.lain
2020-05-11Markers migration: Fix migration for very large list of markerslain
2020-05-11Merge branch 'fix/streamer-timeout' into 'develop'rinpatch
Fix streamer timeout Closes #1735 and #1753 See merge request pleroma/pleroma!2509
2020-05-11Fix streamer timeout (closes #1753).href
Cowboy handles automatically responding to the client's ping, but doesn't automatically send a :ping frame to the client.