You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2 years ago
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
branding_helper.rb	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
context_helper.rb	Compact JSON-LD signed incoming activities (#17426)	2 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	5 years ago
email_helper.rb	Add canonical e-mail blocks for suspended accounts (#16049)	3 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	7 years ago
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
home_helper.rb	Fix wrong size of avatars in admin UI (#19457)	2 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Fix not updating a status when newer version is fetched manually (#17745)	2 years ago
languages_helper.rb	fix name of Lao language (#19520)	2 years ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	3 years ago
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2 years ago
settings_helper.rb	Remove language detection through cld3 (#17478)	2 years ago
statuses_helper.rb	Replace leftover `envelope` icons with `at` icons (#18305)	2 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago