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.

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		4 years ago
..
admin	Add management of delivery availability in Federation settings (#15771)	4 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 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)	4 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Fix use of inline CSS in public pages (#13576)	5 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Fix trying to fetch key from empty URI when verifying HTTP signature (#16100)	4 years ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	4 years ago
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	5 years ago
settings_helper.rb	New Crowdin updates (#16269)	4 years ago
statuses_helper.rb	Fix error when trying to render component for media without meta (#16112)	4 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago