mastodon/app/helpers
Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
..
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01: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 Compact JSON-LD signed incoming activities (#17426) 2022-02-03 14:07:29 +01:00
domain_control_helper.rb Fix whitelist federation for subdomains (#12435) 2019-11-21 11:35:39 +01:00
email_helper.rb Add canonical e-mail blocks for suspended accounts (#16049) 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 use of inline CSS in public pages (#13576) 2020-05-03 22:04:18 +02:00
instance_helper.rb Change OpenGraph description on sign-up page to reflect invite (#11744) 2019-09-03 04:56:54 +02:00
jsonld_helper.rb Fix not updating a status when newer version is fetched manually (#17745) 2022-03-12 09:11:36 +01:00
languages_helper.rb Fix errors when rendering RSS feeds (#18531) 2022-05-26 23:02:42 +02: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 Replace leftover `envelope` icons with `at` icons (#18305) 2022-05-06 00:41:56 +02:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00