Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
admin
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
application_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
branding_helper.rb	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
context_helper.rb
domain_control_helper.rb
email_helper.rb
flashes_helper.rb
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 23:30:10 +02:00
home_helper.rb
instance_helper.rb
jsonld_helper.rb
languages_helper.rb	Fix errors when rendering RSS feeds (#18531)	2022-05-26 23:02:42 +02:00
mascot_helper.rb
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2022-06-23 23:09:32 +02:00
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb