Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.

2023-10-08 16:48:19 +02:00

..

access_token_tracking_concern.rb

Change authorized applications page (#17656)

2022-03-01 16:48:58 +01:00

account_controller_concern.rb

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00

account_owned_concern.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

accountable_concern.rb

Add audit log entries for user roles (#19040)

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

admin_export_controller_concern.rb

Change domain block CSV parsing to be more robust and handle more lists (#21470)

2023-01-18 16:20:52 +01:00

api_caching_concern.rb

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +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

Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)

2023-04-26 11:42:47 +02:00

captcha_concern.rb

Fix Content Security Policy sometimes unnecessarily allowing hCaptcha scripts (#26388)

2023-08-08 15:41:38 +02:00

challengable_concern.rb

Bump rubocop from 0.86.0 to 0.88.0 (#14412)

2020-09-01 03:04:00 +02:00

export_controller_concern.rb

Refactor settings controllers (#14767)

2020-09-11 20:56:35 +02:00

localized.rb

Add trending statuses (#17431)

2022-02-25 00:34:14 +01:00

rate_limit_headers.rb

Fix Naming/MemoizedInstanceVariableName cop (#25928)

2023-07-12 10:08:51 +02:00

registration_spam_concern.rb

Add honeypot fields and minimum fill-out time for sign-up form (#15276)

2020-12-10 06:27:26 +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

Downgrade signature verification debug logging from warn to debug (#26812)

2023-09-06 12:17:22 +02:00

theming_concern.rb

Fixing an issue with a missing argument (#2261)

2023-07-01 22:55:43 +02:00

two_factor_authentication_concern.rb

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

2023-07-12 16:03:05 +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 '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

2023-09-15 21:25:05 +02:00