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 0fd3f87ea2 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.		5 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	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
domains_cli.rb	Change `tootctl domains purge` to accept multiple domains at once (#12046)	5 years ago
emoji_cli.rb	Add --remote-only option to emoji purge (#12810)	5 years ago
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	5 years ago
media_cli.rb	Fix error handling in `tootctl media remove-orphans` (#12571)	5 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	Add parallelization to `tootctl search deploy` (#12051)	5 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
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago