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		2019-07-19 18:26:49 +02:00
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
account_policy.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_warning_preset_policy.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
application_policy.rb	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
backup_policy.rb	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
custom_emoji_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
email_domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
instance_policy.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
invite_policy.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
poll_policy.rb	Ensure only people allowed to see the poll can actually vote (#10161)	2019-03-04 22:47:47 +01:00
relay_policy.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	2018-04-02 22:04:14 +02:00
report_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
settings_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
tag_policy.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
user_policy.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00