Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.

2020-11-08 14:20:35 +01:00

..

account_moderation_note_policy_spec.rb

…

account_policy_spec.rb

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

backup_policy_spec.rb

…

custom_emoji_policy_spec.rb

…

domain_block_policy_spec.rb

Add specs for DomainBlockPolicy (#9585)

2018-12-20 03:47:51 +01:00

email_domain_block_policy_spec.rb

Add specs for EmailDomainBlockPolicy (#9586)

2018-12-20 03:51:41 +01:00

instance_policy_spec.rb

Redesign admin instances area (#9645)

2019-01-08 13:39:49 +01:00

invite_policy_spec.rb

Add specs for InvitePolicy (#9589)

2018-12-20 04:23:09 +01:00

relay_policy_spec.rb

Add specs for policies (#9591)

2018-12-20 17:52:07 +01:00

report_note_policy_spec.rb

Add specs for ReportNotePolicy (#9592)

2018-12-20 17:52:18 +01:00

report_policy_spec.rb

Add specs for policies (#9591)

2018-12-20 17:52:07 +01:00

settings_policy_spec.rb

Add specs for policies (#9591)

2018-12-20 17:52:07 +01:00

status_policy_spec.rb

…

tag_policy_spec.rb

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

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

user_policy_spec.rb

Add specs for UserPolicy (#9593)

2018-12-20 17:51:55 +01:00