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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	Add moderation warnings (#9519)	6 years ago
account_warning_preset_policy.rb	Add moderation warnings (#9519)	6 years ago
application_policy.rb	…
backup_policy.rb	…
custom_emoji_policy.rb	…
domain_block_policy.rb	…
email_domain_block_policy.rb	…
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
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)	6 years ago
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	7 years ago
report_policy.rb	…
settings_policy.rb	…
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
subscription_policy.rb	…
tag_policy.rb	Add profile directory (#9427)	6 years ago
user_policy.rb	Admission-based registrations mode (#10250)	6 years ago