aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
2020-01-20Add benchmark of any/all tag optionslain
2020-01-20Merge branch 'features/cleanup-incoming-actor' into 'develop'rinpatch
2020-01-20Merge branch 'feat/startup-migration-check' into 'develop'lain
2020-01-20Check for unapplied migrations on startuprinpatch
2020-01-19mix.lock: update mock to 0.3.4rinpatch
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-15Merge branch 'ci/docker-imaging' into 'develop'feld
2020-01-15Update docker release / stable jobsjp
2020-01-15Update docker jobs for release branches and stable branchesjp
2020-01-15Fix only: on docker develop/latest jobjp
2020-01-15update `only:` for release/ branch regex matching. and to avoid running image...jp
2020-01-15Fix odd spacingjp
2020-01-15Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'lain
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-15Merge branch 'notifications-from-account' into 'develop'lain
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
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-14Mix Tasks: Add pleroma.benchmarks.tagslain
2020-01-14Merge branch 'warnings-fix' into 'develop'lain
2020-01-14compilation warnings fixAlexander 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-11docs: API: update Mastodon API linkAlibek Omarov
2020-01-10Update Dockerfile with labels. Update gitlab-ci for registry usagejp
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-10Merge branch 'fix/captcha-time' into 'develop'lain
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, mig...Ivan Tashkinov