Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +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	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +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 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +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	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02: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 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02: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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +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-25 23:50:35 +01:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00