Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
accounts_cli.rb
cache_cli.rb
cli_helper.rb	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
domains_cli.rb	Remove the terms blacklist and whitelist from UX (#14149)	2020-06-27 20:20:11 +02:00
email_domain_blocks_cli.rb	Improve email address validation (#14565)	2020-08-12 12:40:25 +02:00
emoji_cli.rb	Add tootctl emoji export (#13534)	2020-04-27 22:17:49 +02:00
feeds_cli.rb
media_cli.rb	Change S3 ACL in "tootctl media remove-orphans --fix-permissions" from fixed value to environment file's value. (#14715)	2020-09-02 00:17:58 +02:00
migration_helpers.rb
premailer_webpack_strategy.rb
preview_cards_cli.rb
redis_config.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
search_cli.rb	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
settings_cli.rb
snowflake.rb
statuses_cli.rb
upgrade_cli.rb	Fix tootctl upgrade storage-schema S3 ACL (#13768)	2020-05-17 17:27:36 +02:00
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00