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 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		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	…
email_helper.rb	…
flashes_helper.rb	…
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	…
jsonld_helper.rb	Fix not updating a status when newer version is fetched manually (#17745)	2 years ago
languages_helper.rb	Add Scots to the supported locales (#20283)	2 years ago
mascot_helper.rb	…
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	…