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

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.

2022-01-16 18:11:20 +01:00

..

admin

Remove IP tracking columns from users table (#16409)

2022-01-16 13:23:50 +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

…