You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2 years ago
..
disputes	Add appeals (#17364)	3 years ago
reports	Add confirmation screen when handling reports (#22375)	2 years ago
settings	Add back missing glitch-soc admin settings (#1919)	2 years ago
trends	Add ability to view previous edits of a status in admin UI (#19462)	2 years ago
users	Add audit log entries for user roles (#19040)	2 years ago
webhooks	Add administrative webhooks (#18510)	2 years ago
account_actions_controller.rb	Add confirmation screen when handling reports (#22375)	2 years ago
account_moderation_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	3 years ago
accounts_controller.rb	Log admin approve and reject account (#22088)	2 years ago
action_logs_controller.rb	Add customizable user roles (#18641)	2 years ago
announcements_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	7 years ago
confirmations_controller.rb	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)	2 years ago
custom_emojis_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
dashboard_controller.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
domain_allows_controller.rb	Add whitelist mode (#11291)	5 years ago
domain_blocks_controller.rb	Remove references to non-existent actions (#24183)	2 years ago
email_domain_blocks_controller.rb	Remove references to non-existent actions (#24183)	2 years ago
export_domain_allows_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2 years ago
export_domain_blocks_controller.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2 years ago
follow_recommendations_controller.rb	Add customizable user roles (#18641)	2 years ago
instances_controller.rb	Add dropdown menu item to open admin interface for remote domains (#21895)	2 years ago
invites_controller.rb	Various fixes and improvements (#12878)	5 years ago
ip_blocks_controller.rb	Fix IP blocks not having a unique index (#19456)	2 years ago
relationships_controller.rb	Add customizable user roles (#18641)	2 years ago
relays_controller.rb	Allow adding relays while secure mode & limited federation mode are enabled (#22324)	2 years ago
report_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	3 years ago
reports_controller.rb	Add notifications for statuses deleted by moderators (#17204)	3 years ago
resets_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
roles_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago
rules_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago
settings_controller.rb	Change settings area to be separated into categories in admin UI (#19407)	2 years ago
site_uploads_controller.rb	Change settings area to be separated into categories in admin UI (#19407)	2 years ago
statuses_controller.rb	Add ability to view previous edits of a status in admin UI (#19462)	2 years ago
tags_controller.rb	Change how hashtags are normalized (#18795)	2 years ago
warning_presets_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago
webhooks_controller.rb	Fix Rails/ActionOrder cop (#24692)	2 years ago