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		2019-09-30 12:23:57 +02:00
..
accounts_cli.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
cli_helper.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
domains_cli.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
emoji_cli.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
feeds_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
media_cli.rb	Add retry for failed media downloads and tootctl media refresh (#11775)	2019-09-10 15:29:12 +02:00
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	2019-01-27 23:56:07 +01:00
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	2018-01-29 01:06:39 +01:00
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
redis_config.rb	Add support for separate Redis for cache (#7272)	2018-04-27 01:37:59 +02:00
search_cli.rb	Add tootctl search deploy to avoid ugly rake task syntax (#10403)	2019-03-28 02:16:11 +01:00
settings_cli.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
snowflake.rb	Fixes/do not override timestamps (#7336)	2018-05-03 23:02:46 +02:00
statuses_cli.rb	Fix tootctl statuses remove	2019-07-24 15:55:39 +02:00
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00