summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-01-15Benchmarks: Move to correct folderlain
2020-01-15[#1478] Adjusted AdminAPIController admin subscope requirements.Ivan Tashkinov
2020-01-14Merge branch 'features/docker-updates' into 'develop'feld
2020-01-14Remove forked test branch matchingjp
2020-01-14Remove artifacts passing by setting `dependencies: []`jp
2020-01-14Merge branch 'features/docker-updates' into 'develop'lain
2020-01-14Add allow_failure to docker jobsjp
2020-01-14Remove cache from docker jobs. Split devlop and stable branches into their ow...jp
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-14Check if object->data is array when looking up attachment objects to deleteRoman Chvanikov
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2020-01-14Merge branch 'warnings-fix' into 'develop'lain
2020-01-14compilation warnings fixAlexander Strizhakov
2020-01-14short labels and fixes for typosAlexander Strizhakov
2020-01-14Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-13Merge branch 'feature/ci-registry' into 'develop'lain
2020-01-12Merge branch 'feature/attachments-cleanup' into 'develop'feld
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
2020-01-12Merge branch 'config/benchmark' into 'develop'feld
2020-01-12Merge branch 'issue/1354' into 'develop'feld
2020-01-12Assign token that can write to followsMark Felder
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
2020-01-11Merge branch 'patch-1' into 'develop'rinpatch
2020-01-11Merge branch 'remove/remove-mdii-uploader' into 'develop'rinpatch
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-11Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-11docs: API: update Mastodon API linkAlibek Omarov
2020-01-10Update Dockerfile with labels. Update gitlab-ci for registry usagejp
2020-01-10don't migrate prometheus settingsAlexander Strizhakov
2020-01-10more renamingsAlexander Strizhakov
2020-01-10don't migrate configurable_from_database settingAlexander Strizhakov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
2020-01-10fix for pleroma assets group updateAlexander Strizhakov
2020-01-10syncing new setting to descriptions.exsAlexander Strizhakov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-10Merge branch 'issue/1490' into 'develop'lain
2020-01-10Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'lain
2020-01-10Update AdminFE buildAlexander Strizhakov
2020-01-10deep merge in config updateAlexander Strizhakov
2020-01-10flag for delete fixAlexander
2020-01-10little fixes and typos fixAlexander
2020-01-10fixes for logger backendsAlexander
2020-01-10fix for subgroup tupleAlexander
2020-01-10logger backends fixAlexander
2020-01-10parsing proxy url settingAlexander
2020-01-10suggestions fixAlexander
2020-01-10typo fixAlexander
2020-01-10adapter childrenAlexander