Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +01:00
..
accounts_cli.rb	Add tootctl accounts merge (#15201)	2020-11-23 17:50:16 +01: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 search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
domains_cli.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01: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	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
ip_blocks_cli.rb	Fix tootctl ip_blocks add failing if not given a comment (#15263)	2020-12-02 21:19:41 +01:00
maintenance_cli.rb	Bump max supported schema version in maintenance script (#15349)	2020-12-15 12:57:24 +01:00
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	Do not suggest to login into the GitLab database (#13084)	2020-02-15 12:52:57 +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	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	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	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
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-12-05 17:33:37 +01:00