You cannot 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.		5 years ago
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Change account suspensions to be reversible by default (#14726)	6 years ago
action_logs_controller.rb	Add ability to filter audit log in admin UI (#13381)	6 years ago
announcements_controller.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	6 years ago
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)	6 years ago
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	Improve email address validation (#14565)	6 years ago
instances_controller.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	6 years ago
invites_controller.rb	Various fixes and improvements (#12878)	6 years ago
ip_blocks_controller.rb	Add IP-based rules (#14963)	5 years ago
pending_accounts_controller.rb	…
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	6 years ago
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	Various fixes and improvements (#12878)	6 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	6 years ago
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	Various fixes and improvements (#12878)	6 years ago
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	6 years ago