mastodon/app/helpers
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
accounts_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
application_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01: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 Fix wrong size of avatars in admin UI (#19457) 2022-10-25 21:43:33 +02:00
instance_helper.rb
jsonld_helper.rb
languages_helper.rb Add Scots to the supported locales (#20283) 2022-11-10 21:11:38 +01: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 Replace leftover envelope icons with at icons (#18305) 2022-05-06 00:41:56 +02:00
webfinger_helper.rb