Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.

2022-01-17 10:45:25 +01:00

..

admin

Add notifications for statuses deleted by moderators (#17204)

2022-01-17 09:41:33 +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

2021-10-14 21:44:57 +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

languages_helper.rb

Add trending links (#16917)

2021-11-25 13:07:38 +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

Add trending links (#16917)

2021-11-25 13:07:38 +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