about summary refs log tree commit diff
path: root/lib/mastodon
AgeCommit message (Expand)Author
2021-04-11Fix DB connection pool settings in CLI (#15983)abcang
2021-04-02Merge branch 'glitch'Starfall
2021-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-24tootctl emoji import: case insensitive duplicate check (#15738)Stanislas
2021-03-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-19Remove MySQL-specific code from Mastodon::MigrationHelpers (#15924)Claire
2021-03-19Change deduplication order of tootctl maintenance fix-duplicates (#15923)Claire
2021-03-19Further preparation for Rails 6 (#15916)Claire
2021-03-17Prepare Mastodon for Rails 6 (#15911)Claire
2021-02-08Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-01-31Fixed code quality issues (#15541)Shubhendra Singh Chauhan
2021-01-29Fix “tootctl accounts unfollow” (#15639)ThibG
2021-01-26Merge remote-tracking branch 'glitchsoc/main' into mainStarfall
2021-01-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-01-22Optimize some regex matching (#15528)luigi
2021-01-18Merge branch 'master' into glitch-soc/merge-upstreamClaire
2021-01-13Merge branch 'glitch' into mainStarfall
2021-01-12Use Rails' index_by where it makes sense (#15542)ThibG
2021-01-11Merge branch 'master' into glitch-soc/merge-upstreamClaire
2021-01-09Fix maintenance script not re-indexing some indexes on textual values (#15515)ThibG
2021-01-07Merge remote-tracking branch 'glitchsoc/master' into mainStarfall
2021-01-06Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-30Improve Emoji import (fix #15429) (#15430)Sophie Parker
2020-12-27Bump version to 3.3.0 (#15433)Eugen Rochko
2020-12-26Fix being able to import more than allowed number of follows (#15384)ThibG
2020-12-24Merge branch 'glitch' into mainStarfall
2020-12-23Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-23Bump version to 3.3.0rc3 (#15411)Eugen Rochko
2020-12-22Fix external user creation failing when invite request text is required (#15405)ThibG
2020-12-19Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-19Fix "tootctl accounts fix-duplicates" (#15373)ThibG
2020-12-19Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-19Bump version to 3.3.0rc2 (#15365)Eugen Rochko
2020-12-18Fix resolving accounts sometimes creating duplicate records for a given AP id...ThibG
2020-12-18Bump max supported schema version in maintenance script (#15359)ThibG
2020-12-15Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-15Bump max supported schema version in maintenance script (#15349)ThibG
2020-12-14Fix performance on instances list in admin UI (#15282)Eugen Rochko
2020-12-07Merge branch 'glitch' into mainStarfall
2020-12-05Merge branch 'master' into glitch-soc/merge-upstreamClaire
2020-12-04Fix account merging in maintenance script (#15264)ThibG
2020-12-02Fix tootctl ip_blocks add failing if not given a comment (#15263)ThibG
2020-12-01Merge branch 'glitch' into mainStarfall
2020-12-01Bump version to 3.3.0rc1 (#15230)Eugen Rochko
2020-11-27Bump version to 3.2.1 (#15227)Eugen Rochko
2020-11-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-11-23Add `tootctl accounts merge` (#15201)Eugen Rochko
2020-11-20Merge branch 'glitch' into mainStarfall
2020-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka