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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		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	…
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	…
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	…
settings_cli.rb	…
snowflake.rb	…
statuses_cli.rb	…
version.rb	…