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 631dacf1d7 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
..
chewy	Fix bookmarks also searchable (#13293)	5 years ago
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailers	Fix error when sending moderation notification (#13014)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
serializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
validators	Improve polls: option lengths & redesign (#13257)	5 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
workers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago