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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
account_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	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
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	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
user_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago