mastodon/app/views/admin
Claire 1b6a21e6bc Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.
2021-03-11 16:08:15 +01:00
..
account_actions Add inline description of moderation actions in moderation interface (#15792) 2021-02-24 16:53:16 +01:00
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
account_warnings
accounts Fix some ignored brakeman warnings (#15829) 2021-03-07 07:06:56 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2021-03-11 16:08:15 +01:00
announcements Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
change_emails
custom_emojis Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
email_domain_blocks Fix some ignored brakeman warnings (#15829) 2021-03-07 07:06:56 +01:00
instances Fix some ignored brakeman warnings (#15829) 2021-03-07 07:06:56 +01:00
invites
ip_blocks Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
pending_accounts Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
relationships Fix admin-facing uses of inline CSS (#13575) 2020-04-28 19:39:16 +02:00
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
rules Add server rules (#15769) 2021-02-21 19:50:12 +01:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
statuses Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
tags Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00