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 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02: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 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-24 10:53:50 +01:00
announcements
change_emails
custom_emojis
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
domain_allows
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 Fix the follow recommendation admin page on glitch-soc 2021-04-20 12:22:50 +02:00
instances Add management of delivery availability in Federation settings (#15771) 2021-05-05 23:39:02 +02:00
invites
ip_blocks
pending_accounts
relationships
relays
report_notes
reports Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +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-05-07 18:21:59 +02:00
statuses
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
warning_presets