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 f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		6 years ago
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
account_policy.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	7 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_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	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
invite_policy.rb	Allow admin to deactivate invite created by users (#5860)	7 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	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
settings_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
status_policy.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
user_policy.rb	Feature: Allow staff to change user emails (#7074)	7 years ago