Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +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