Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.

2020-12-19 00:55:12 +01:00

..

account_moderation_note_policy.rb

…

account_policy.rb

Fix admins being able to suspend their instance actor (#14567)

2020-12-15 17:23:58 +01:00

account_warning_preset_policy.rb

…

announcement_policy.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

application_policy.rb

…

backup_policy.rb

…

custom_emoji_policy.rb

…

domain_allow_policy.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

domain_block_policy.rb

Fix performance on instances list in admin UI (#15282)

2020-12-14 09:06:34 +01:00

email_domain_block_policy.rb

…

instance_policy.rb

…

invite_policy.rb

…

ip_block_policy.rb

Add IP-based rules (#14963)

2020-10-12 16:33:49 +02:00

poll_policy.rb

…

relay_policy.rb

…

report_note_policy.rb

…

report_policy.rb

…

settings_policy.rb

Add ability to delete files uploaded for settings in admin UI (#13192)

2020-03-08 16:00:24 +01:00

status_policy.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-09-28 14:13:30 +02:00

tag_policy.rb

Change admin UI for hashtags and add back whitelisted trends (#11490)

2019-08-05 19:54:29 +02:00

user_policy.rb

…