This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2021-07-08 16:17:19 +02:00
..
admin	Add management of delivery availability in Federation settings (#15771)	2021-05-05 23:39:02 +02:00
settings	…
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
domain_control_helper.rb	…
email_helper.rb	Add canonical e-mail blocks for suspended accounts (#16049)	2021-04-17 03:14:25 +02:00
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	Fix trying to fetch key from empty URI when verifying HTTP signature (#16100)	2021-05-01 23:18:59 +02:00
mascot_helper.rb	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
routing_helper.rb	…
settings_helper.rb	New Crowdin updates (#16269)	2021-05-20 00:19:52 +02:00
statuses_helper.rb	Fix error when trying to render component for media without meta (#16112)	2021-05-05 21:16:55 +02:00
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00