Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		2020-03-08 19:38:53 +01: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	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
domains_cli.rb	Change tootctl domains purge to accept multiple domains at once (#12046)	2019-10-02 04:49:53 +02:00
emoji_cli.rb	Add --remote-only option to emoji purge (#12810)	2020-01-10 00:10:17 +01: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	Fix error handling in tootctl media remove-orphans (#12571)	2019-12-09 04:26:00 +01: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
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-27 12:37:15 +01:00