mastodon/app/policies
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
..
account_moderation_note_policy.rb
account_policy.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02: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
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
email_domain_block_policy.rb
instance_policy.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
invite_policy.rb
poll_policy.rb Ensure only people allowed to see the poll can actually vote (#10161) 2019-03-04 22:47:47 +01:00
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 Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00