mastodon/app/policies
Claire 3e4b8636a0 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how docker images were built, including how
  they were cached.
  I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
  The feature, that was in glitch-soc, got backported upstream.
  It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
  Glitch-soc changes have been backported upstream. As a result,
  some code from `app/javascript/core/admin.js` got added upstream.
  Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
  Upstream added something to distinguish unusable and unusable-because-moved
  accounts, while glitch-soc considers moved accounts usable.
  Took upstream's code for `functional_or_moved?` and made `functional?`
  call it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream cleaned up code style a bit, on a line that we had custom changes
  for.
  Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
  Upstream adopted one CSP directive we already had.
  The conflict is because of our files being structurally different, but the
  change itself was already part of glitch-soc.
  Kept our version.
2022-11-17 12:01:37 +01:00
..
admin Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
account_moderation_note_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_warning_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_warning_preset_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
announcement_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
appeal_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
application_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
audit_log_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
backup_policy.rb
canonical_email_block_policy.rb Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
custom_emoji_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
dashboard_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
delivery_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
domain_allow_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
domain_block_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
email_domain_block_policy.rb Fix getting a single EmailDomainBlock (#20846) 2022-11-17 10:55:50 +01:00
follow_recommendation_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
instance_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
invite_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
ip_block_policy.rb Fix GET /api/v1/admin/ip_blocks/:id (#20207) 2022-11-09 15:22:58 +01: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 customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
preview_card_provider_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
relay_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
report_note_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
report_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
rule_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
settings_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
status_policy.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
tag_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
user_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
user_role_policy.rb Add support for editing labelling of one's own role (#18812) 2022-07-17 13:37:30 +02:00
webhook_policy.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00