You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
accounts_cli.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
cache_cli.rb	…
cli_helper.rb	Fix DB connection pool settings in CLI (#15983)	4 years ago
domains_cli.rb	Add --by-uri option to `tootctl domains purge` (#16434)	3 years ago
email_domain_blocks_cli.rb	Fixed code quality issues (#15541)	4 years ago
emoji_cli.rb	tootctl emoji import: case insensitive duplicate check (#15738)	4 years ago
feeds_cli.rb	…
ip_blocks_cli.rb	Fix tootctl ip_blocks add failing if not given a comment (#15263)	4 years ago
maintenance_cli.rb	Fix account deletion sometimes failing because of optimistic locks (#16317)	4 years ago
media_cli.rb	Use Rails' index_by where it makes sense (#15542)	4 years ago
migration_helpers.rb	Fix migration script not being able to run if it fails midway (#16312)	4 years ago
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	…
redis_config.rb	Add a Redis environment variable for sidekiq (#16188)	4 years ago
search_cli.rb	Fix `tootctl search deploy` on Ruby 3 (#16346)	4 years ago
settings_cli.rb	…
snowflake.rb	…
statuses_cli.rb	…
upgrade_cli.rb	…
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago