aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-13Merge branch 'openapi/statuses' into 'develop'lain
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
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
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
2020-05-12Upgrade Comeonin to v5Alex Gleason
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
2020-05-12Filter config descriptions by config whitelistStephanie Wilde-Hobbs
2020-05-12fix eldap being required for non-OTP releasesrinpatch
2020-05-12Merge branch 'streamer-get-topic' into 'develop'rinpatch
2020-05-12Fix typo in testhref
2020-05-12Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'rinpatch
2020-05-12Merge branch '1748-remote-following-follower-count' into 'develop'rinpatch
2020-05-12Add database configuration whitelistStephanie Wilde-Hobbs
2020-05-12Expand and authorize streams in Streamer directlyhref
2020-05-12Merge branch 'otp-version-update-suggestion' into 'develop'lain
2020-05-12Merge branch '1020-honk-announces' into 'develop'lain
2020-05-12Startup: suggest updating OTP when the version is too low for gunrinpatch
2020-05-12Merge branch 'giving-up' into 'develop'rinpatch
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
2020-05-11Merge branch 'migration-fix-markers' into 'develop'rinpatch
2020-05-11Merge branch 'chore/gettext-update' into 'develop'rinpatch
2020-05-12Gettext: remove english messages and update the pot filerinpatch
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
2020-05-11Fix streamer timeout (closes #1753).href
2020-05-11Merge branch '1439-favorite-deletion' into 'develop'lain
2020-05-11SideEffects test: Add test for favorite deletion.lain
2020-05-11Merge branch '1204-object-pruning-deletion' into 'develop'rinpatch
2020-05-11Deletion: Handle the case of pruned objects.lain