mastodon/app/policies
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
..
account_moderation_note_policy.rb
account_policy.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
account_warning_policy.rb Fix issues when attempting to appeal an old strike (#17554) 2022-02-16 22:29:48 +01:00
account_warning_preset_policy.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
announcement_policy.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
appeal_policy.rb Add appeals (#17364) 2022-02-14 21:27:53 +01: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
delivery_policy.rb Add management of delivery availability in Federation settings (#15771) 2021-05-05 23:39:02 +02:00
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
follow_recommendation_policy.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
instance_policy.rb Add ability to purge undeliverable domains from admin interface (#16686) 2021-12-17 23:01:21 +01:00
invite_policy.rb Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
ip_block_policy.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
poll_policy.rb Ensure only people allowed to see the poll can actually vote (#10161) 2019-03-04 22:47:47 +01:00
preview_card_policy.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
preview_card_provider_policy.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01: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
rule_policy.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
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 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
tag_policy.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
user_policy.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00