0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-26 07:06:48 +00:00
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 () 2022-06-11 20:32:02 +02:00
context_helper.rb Compact JSON-LD signed incoming activities () 2022-02-03 14:07:29 +01:00
domain_control_helper.rb
email_helper.rb Add canonical e-mail blocks for suspended accounts () 2021-04-17 03:14:25 +02:00
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 () 2022-10-25 21:43:33 +02:00
instance_helper.rb
jsonld_helper.rb Fix not updating a status when newer version is fetched manually () 2022-03-12 09:11:36 +01:00
languages_helper.rb Add Scots to the supported locales () 2022-11-10 21:11:38 +01:00
mascot_helper.rb Use custom mascot on static share page () 2021-02-11 02:18:56 +01:00
routing_helper.rb Fix CDN_HOST not affected on full_asset_url () 2022-06-23 23:09:32 +02:00
settings_helper.rb Remove language detection through cld3 () 2022-02-08 02:41:17 +01:00
statuses_helper.rb Replace leftover envelope icons with at icons () 2022-05-06 00:41:56 +02:00
webfinger_helper.rb Remove dependency on goldfinger gem () 2020-10-08 00:34:57 +02:00