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 f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
accounts_cli.rb	Add `--reset-password` option to `tootctl accounts modify` (#13126)	5 years ago
cache_cli.rb	…
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 `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)	5 years ago
migration_helpers.rb	Do not suggest to login into the GitLab database (#13084)	5 years ago
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	…
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	…
snowflake.rb	…
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