mastodon/app/helpers
Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
2023-02-03 19:23:27 +01:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +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-12-15 20:25:25 +01: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 Address check-i18n warnings (#23313) 2023-02-02 10:14:19 +09: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 Fix attachment rendering of edited posts in OpenGraph (#22270) 2022-12-15 17:41:20 +01:00
webfinger_helper.rb