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
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	…
features	Add submit button to the top of preferences pages (#13068)	5 years ago
fixtures	…
helpers	…
lib	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	5 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	…
workers	…
rails_helper.rb	Bump sidekiq from 5.2.7 to 6.0.4 (#11727)	5 years ago
spec_helper.rb	…