1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
YuruToot/app/helpers
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +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 2023-02-25 14:00:40 +01:00
branding_helper.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
context_helper.rb Compact JSON-LD signed incoming activities (#17426) 2022-02-03 14:07:29 +01:00
domain_control_helper.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
email_helper.rb Apply Rubocop Performance/StringReplacement (#23445) 2023-02-08 03:21:21 +01:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
formatting_helper.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
jsonld_helper.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
languages_helper.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
mascot_helper.rb Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
routing_helper.rb Fix CDN_HOST not affected on full_asset_url (#18662) 2022-06-23 23:09:32 +02:00
settings_helper.rb Remove language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statuses_helper.rb Fix attachment rendering of edited posts in OpenGraph (#22270) 2022-12-15 17:41:20 +01:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00