1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-03 17:28:35 +09:00
YuruToot/app/controllers/settings
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
..
exports File cleanup/organization in controllers/concerns (#27846) 2023-11-30 14:39:41 +00:00
migration Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
preferences Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
two_factor_authentication Move OTP secret length to configuration (#32125) 2024-10-01 09:38:42 +00:00
aliases_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
applications_controller.rb Change read:me scope to profile scope (#30357) 2024-06-06 07:30:10 +00:00
base_controller.rb Set "admin" body class from admin nested layout (#31269) 2024-09-06 13:58:46 +00:00
deletes_controller.rb Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053) 2023-11-30 15:43:26 +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 not_featured_by scope to Tag (#28815) 2024-04-17 10:05:38 +00:00
flavours_controller.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
imports_controller.rb Use enum-generated scopes/queries for BulkImport (#29975) 2024-04-18 10:13:35 +00:00
login_activities_controller.rb Replace use_pack, layouts/theme and @theme by new helpers 2024-04-28 15:45:42 +02:00
migrations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
pictures_controller.rb Fix profile update not being sent on profile/header picture deletion (#15461) 2020-12-30 23:19:18 +01:00
privacy_controller.rb Add new public status index (#26344) 2023-08-24 16:40:04 +02:00
profiles_controller.rb Add privacy tab in profile settings (#26484) 2023-08-14 18:52:45 +02:00
sessions_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02: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 ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00