Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		2018-10-22 17:51:38 +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	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	2018-04-02 13:45:07 +02: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	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
invite_policy.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02: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	2018-10-22 17:51:38 +02:00
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
user_policy.rb	Allow mods to disable login, improve message when login disabled (#8329)	2018-08-23 23:26:29 +02:00