mastodon/app/helpers
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
admin Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
settings
accounts_helper.rb
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
domain_control_helper.rb
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
routing_helper.rb
settings_helper.rb Add missing locales (#15138) 2020-11-10 14:44:17 +01:00
statuses_helper.rb Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 2020-12-15 12:56:43 +01:00
webfinger_helper.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00