Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.

2025-07-30 20:05:45 +02:00

..

exports

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

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

migration

Use moved? query method where relevant (#35542)

2025-07-28 08:02:21 +00:00

preferences

Use expect in remaining controller locations (#33748)

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

two_factor_authentication

Set flash options via redirect where possible (#35370)

2025-07-24 08:03:28 +00:00

aliases_controller.rb

Use expect for nested params in settings/* controllers (#33673)

2025-01-22 08:49:52 +00:00

applications_controller.rb

Drop custom scopes conversion code from /settings/applications controller (#33819)

2025-02-04 09:31:42 +00:00

base_controller.rb

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

deletes_controller.rb

Use expect for nested params in settings/* controllers (#33673)

2025-01-22 08:49:52 +00:00

exports_controller.rb

Extract ExportSummary class for account object counts (#32227)

2024-10-03 13:09:58 +00:00

featured_tags_controller.rb

Add REST API for featuring and unfeaturing a hashtag (#34489)

2025-04-25 15:12:05 +00:00

flavours_controller.rb

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

imports_controller.rb

Use expect for nested params in settings/* controllers (#33673)

2025-01-22 08:49:52 +00:00

login_activities_controller.rb

Confirm User#login_activities in auth/sessions spec (#35372)

2025-07-15 06:31:00 +00:00

migrations_controller.rb

Use expect for nested params in settings/* controllers (#33673)

2025-01-22 08:49:52 +00:00

pictures_controller.rb

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00

privacy_controller.rb

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00

profiles_controller.rb

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00

sessions_controller.rb

Set flash options via redirect where possible (#35370)

2025-07-24 08:03:28 +00:00

two_factor_authentication_methods_controller.rb

Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)

2023-10-23 15:46:21 +00:00

verifications_controller.rb

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00