catstodon/app/controllers/settings
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01: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 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +02:00
aliases_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
applications_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
base_controller.rb Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
deletes_controller.rb Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053) 2023-11-30 15:43:26 +00:00
exports_controller.rb Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
featured_tags_controller.rb Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
flavours_controller.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
imports_controller.rb Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
login_activities_controller.rb Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +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 Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00