Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01: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	2022-01-26 22:32:21 +01:00
context_helper.rb	Compact JSON-LD signed incoming activities (#17426)	2022-02-03 14:07:29 +01: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 compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	2022-02-03 14:09:04 +01:00
languages_helper.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01: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	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01: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