Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.		2023-12-17 15:32:29 +01: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	Remove version check from update cache_concern.rb (#27592)	2023-10-30 14:04:12 +00: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	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	2023-10-23 15:46:21 +00: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 '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +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