glitchier-soc/app/controllers/concerns
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
..
admin File cleanup/organization in controllers/concerns (#27846) 2023-11-30 14:39:41 +00:00
api File cleanup/organization in controllers/concerns (#27846) 2023-11-30 14:39:41 +00:00
auth Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
settings File cleanup/organization in controllers/concerns (#27846) 2023-11-30 14:39:41 +00:00
account_controller_concern.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
account_owned_concern.rb Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053) 2023-11-30 15:43:26 +00:00
accountable_concern.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
authorization.rb Bump pundit from 2.1.1 to 2.2.0 (#17543) 2022-02-19 13:30:06 +09:00
cache_concern.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
challengable_concern.rb Remove un-needed action and template options to render in controllers (#28022) 2023-11-29 10:38:05 +00:00
localized.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
session_tracking_concern.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
signature_authentication.rb Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) 2018-02-02 10:19:59 +01:00
signature_verification.rb Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476) 2024-01-03 11:29:26 +00:00
theming_concern.rb Fixing an issue with a missing argument (#2261) 2023-07-01 22:55:43 +02:00
user_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
web_app_controller_concern.rb Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00