Fix merge conflicts with upstream
[akkoma] / benchmarks / load_testing /
2020-05-17 lainMerge branch 'feature/remove-settings-that-shouldnt...
2020-05-17 lainMerge branch 'pleroma-fe-2020-05-13-with-relationships...
2020-05-17 lainMerge branch 'restricted-relations-embedding' into...
2020-05-16 lainMerge branch 'develop' into 'remove-twitter-api'
2020-05-14 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-14 rinpatchMerge branch 'feature/database-configuration-whitelist...
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-05-13 Roman ChvanikovMerge develop
2020-05-13 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-05-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-13 lainMerge branch 'openapi/statuses' into 'develop'
2020-05-13 lainMerge branch 'openapi/timelines' into 'develop'
2020-05-13 lainMerge branch 'upgrade-comeonin' into 'develop'
2020-05-12 Alex GleasonUpgrade Comeonin to v5
2020-05-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-08 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-05-01 Ivan TashkinovRestricted embedding of relationships where applicable...
2020-05-01 lainMerge branch 'issue/1577' into 'develop'
2020-05-01 Maksim PechnikovMerge branch 'develop' into issue/1276-2
2020-04-30 lainMerge branch '1364-no-pushes-from-blocked-domains-users...
2020-04-28 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-28 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-28 lainMerge branch 'mongoose-secure' into 'develop'
2020-04-27 Egor KislitsynMerge branch 'develop' into openapi/account
2020-04-27 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-24 rinpatchMerge branch 'bugfix/announce-race-condition' into...
2020-04-24 lainMerge branch 'reply-filtering-refactor' into 'develop'
2020-04-24 lainReply Filtering: Refactor.
2020-04-24 Alexander Strizhakovbench sync
2020-04-24 Alexander Strizhakovupdating benchmarks
2020-04-24 Alexanderreply filtering
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-04-21 lainMerge branch 'openapi/custom-emojis' into 'develop'
2020-04-20 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-20 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-04-20 lainMerge branch 'mrf-docs-update' into 'develop'
2020-04-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-17 HaelwennMerge branch 'feature/1584-client-captcha-options'...
2020-04-16 rinpatchMerge branch 'develop' into features/remove-user-source...
2020-04-16 rinpatchMerge branch 'refactor/remove-upgrade-changeset' into...
2020-04-15 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-15 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-14 feldMerge branch 'logger-configuration' into 'develop'
2020-04-14 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-13 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-04-13 rinpatchMerge branch 'output-of-relationships-in-statuses'...
2020-04-13 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-11 rinpatchMerge branch 'following-relationships-optimizations...
2020-04-10 Egor KislitsynMerge branch 'develop' into global-status-expiration
2020-04-10 Egor KislitsynMerge branch 'develop' into fix/support-conversations...
2020-04-10 HaelwennMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
2020-04-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-04-06 lainMerge branch 'featureflag/emoji_reactions' into 'develop'
2020-04-06 lainMerge branch 'remake-remodel-2' into 'develop'
2020-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/2323-accou...
2020-04-02 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-04-01 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-04-01 feldMerge branch 'gun' into 'develop'
2020-04-01 Ivan TashkinovAbility to control the output of account/pleroma/relati...
2020-03-30 lainMerge branch 'benchmark-improvements' into 'develop'
2020-03-30 Alexander StrizhakovMerge branch 'develop' into gun
2020-03-30 Alexander Strizhakovuse in timelines benchmark new user generator
2020-03-30 Alexander Strizhakovfix
2020-03-30 Alexander Strizhakovsync with develop
2020-03-30 Alexander Strizhakovactivities generation tasks
2020-03-29 HaelwennMerge branch 'feature/funkwhale-audio' into 'develop'
2020-03-29 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-25 rinpatchMerge branch 'benchmark_timeline' into 'develop'
2020-03-25 lainApply suggestion to benchmarks/load_testing/generator.ex
2020-03-23 lainBenchmarks: Add timeline benchmark
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-02-20 lainMerge branch 'require-signature' into 'develop'
2020-02-20 lainMerge branch 'docs_updating' into 'develop'
2020-01-30 rinpatchMerge branch 'develop' into fix/disable-rate-limiter...
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2020-01-27 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-01-26 Mark FelderMerge branch 'develop' into issue/1280
2020-01-22 rinpatchMerge branch 'no-error-404' into 'develop'
2020-01-22 Egor KislitsynMerge branch 'develop' into feature/new-registrations...
2020-01-22 Maksim PechnikovMerge branch 'develop' into issue/1383
2020-01-21 Roman ChvanikovMerge branch 'develop' into fix/attachments-cleanup
2020-01-21 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-21 Maksim PechnikovMerge branch 'develop' into feature/tag_feed
2020-01-20 Mark FelderMerge branch 'develop' into fix/attachments-cleanup
2020-01-20 lainMerge branch 'credo/version-bump-1.1.5' into 'develop'
2020-01-20 lainMerge branch 'fix-admin-api-scope' into 'develop'
2020-01-20 HaelwennMerge branch 'hashtag-benchmarks' into 'develop'
2020-01-14 lainMix Tasks: Add pleroma.benchmarks.tags
2019-12-10 SadposterMerge branch 'develop' into 'domain-block-precedence'
2019-12-09 lainMerge branch 'exclude-visibilities-for-like-notificatio...
2019-12-05 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-05 feldMerge branch 'feature/admin-api-render-whole-status...
2019-12-05 Maksim PechnikovMerge branch 'develop' into issue/1342
2019-12-05 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-12-04 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-12-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
next