Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +02:00
..
accounts_cli.rb	Add --reset-password option to tootctl accounts modify (#13126)	2020-02-22 01:29:14 +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	Add separate cache directory for non-local uploads (#12821)	2020-04-26 23:29:08 +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	Fix help text around tootctl email_domain_blocks (#14147)	2020-06-26 21:28:40 +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
media_cli.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +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	Fix installation failing when Redis password contains special characters (#13156)	2020-02-29 03:00:43 +01:00
search_cli.rb	Add parallelization to tootctl search deploy (#12051)	2019-10-02 21:50:43 +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-05-14 18:49:10 +02:00