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 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
accounts_cli.rb	Add `--reset-password` option to `tootctl accounts modify` (#13126)	5 years ago
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
cli_helper.rb	Change `tootctl search deploy` algorithm (#14300)	4 years ago
domains_cli.rb	Remove the terms blacklist and whitelist from UX (#14149)	4 years ago
email_domain_blocks_cli.rb	Improve email address validation (#14565)	4 years ago
emoji_cli.rb	Add `tootctl emoji export` (#13534)	5 years ago
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
media_cli.rb	Fix an error when file_file_size is nil in tootctl media remove (#14657)	4 years ago
migration_helpers.rb	Do not suggest to login into the GitLab database (#13084)	5 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
redis_config.rb	Fix installation failing when Redis password contains special characters (#13156)	5 years ago
search_cli.rb	Change `tootctl search deploy` algorithm (#14300)	4 years ago
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	Fixes/do not override timestamps (#7336)	7 years ago
statuses_cli.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
upgrade_cli.rb	Fix `tootctl upgrade storage-schema` S3 ACL (#13768)	5 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago