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.

Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
account_policy.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
account_warning_preset_policy.rb	Add moderation warnings (#9519)	6 years ago
announcement_policy.rb	Add announcements (#12662)	5 years ago
application_policy.rb	Account archive download (#6460)	7 years ago
backup_policy.rb	Account archive download (#6460)	7 years ago
custom_emoji_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
domain_allow_policy.rb	Add whitelist mode (#11291)	5 years ago
domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
email_domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
instance_policy.rb	Redesign admin instances area (#9645)	6 years ago
invite_policy.rb	Add admin function to deactivate all invites (#8279)	6 years ago
ip_block_policy.rb	Add IP-based rules (#14963)	4 years ago
poll_policy.rb	Ensure only people allowed to see the poll can actually vote (#10161)	6 years ago
relay_policy.rb	Add federation relay support (#7998)	7 years ago
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	7 years ago
report_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
settings_policy.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	5 years ago
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tag_policy.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
user_policy.rb	Admission-based registrations mode (#10250)	6 years ago