Claire c96eebde37 Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5 ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.

2026-01-19 18:29:02 +01:00

..

admin

Use expect in Admin::ExportControllerConcern import params (#33745)

2025-01-27 14:29:25 +00:00

api

Remove the outgoing_quotes feature flag, making the feature unconditional (#36130)

2025-09-24 08:58:08 +00:00

auth

Extract constants for captcha directives/sources (#35439)

2025-07-23 07:55:54 +00:00

settings

File cleanup/organization in controllers/concerns (#27846)

2023-11-30 14:39:41 +00:00

account_controller_concern.rb

Add have_http_link_header matcher and set header values as strings (#31010)

2024-09-05 20:05:38 +00:00

account_owned_concern.rb

Add support for numeric-based URIs for local accounts (#32724)

2025-09-29 12:05:48 +00:00

accountable_concern.rb

Add audit log entries for user roles (#19040)

2022-08-25 20:39:40 +02:00

async_refreshes_concern.rb

Add result_count to Mastodon-Async-Refresh header when needed (#36239)

2025-10-10 12:26:10 +00: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

Fix Vary parsing in cache control enforcement (#37426)

2026-01-19 11:37:34 +01:00

challengable_concern.rb

Use expect in remaining controller locations (#33748)

2025-01-27 16:32:06 +00:00

deprecation_concern.rb

Add Deprecation headers on deprecated endpoints (#34262)

2025-03-25 12:30:10 +00:00

localized.rb

Change DEFAULT_LOCALE to not override unauthenticated users' browser language (#34535)

2025-04-24 11:38:27 +00:00

preloading_concern.rb

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00: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

Change HTTP Signature verification status from 401 to 503 on temporary failure to get remote actor (#37221)

2025-12-19 11:02:32 +01:00

theming_concern.rb

Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream

2025-06-12 20:32:25 +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 '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream

2025-07-08 16:41:01 +02:00