monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/settings
History
Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 		2025-02-05 18:21:36 +01:00
..
exports File cleanup/organization in `controllers/concerns` (#27846) 2023-11-30 14:39:41 +00:00
migration Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +00:00
preferences Use `expect` in remaining controller locations (#33748) 2025-01-27 16:32:06 +00:00
two_factor_authentication Use `expect` params wrapper for more "auth" and "2FA" "controllers" (#33717) 2025-01-24 14:40:20 +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 Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +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 Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
migrations_controller.rb Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +00:00
pictures_controller.rb
…
privacy_controller.rb Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +00:00
profiles_controller.rb Fix issue with saving empty fields values on profile update (#33689) 2025-01-22 18:50:15 +00:00
sessions_controller.rb
…
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 Use `expect` params wrapper for more "auth" and "2FA" "controllers" (#33717) 2025-01-24 14:40:20 +00:00