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.

Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
accounts_cli.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
cli_helper.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
domains_cli.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
emoji_cli.rb	Add categories for custom emojis (#11196)	6 years ago
feeds_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
media_cli.rb	Add retry for failed media downloads and `tootctl media refresh` (#11775)	5 years ago
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
redis_config.rb	…
search_cli.rb	Add `tootctl search deploy` to avoid ugly rake task syntax (#10403)	6 years ago
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	…
statuses_cli.rb	Fix tootctl statuses remove	5 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago