This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +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
account_warnings
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
announcements
change_emails
custom_emojis Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01: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
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
instances Add ability to purge undeliverable domains from admin interface (#16686) 2021-12-17 23:01:21 +01:00
invites
ip_blocks Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
relationships
relays
report_notes Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
rules Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 01:15:32 +01:00
warning_presets