Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.

2023-04-09 11:45:08 +02:00

..

exports

…

migration

…

preferences

…

two_factor_authentication

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-09 11:45:08 +02:00

aliases_controller.rb

…

applications_controller.rb

Change POST /settings/applications/:id to regenerate token on scopes change (#23359)

2023-02-02 12:03:49 +01:00

base_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-16 08:30:00 +01:00

deletes_controller.rb

Remove setting that disables account deletes (#17683)

2022-10-06 10:16:47 +02:00

exports_controller.rb

…

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

…

login_activities_controller.rb

…

migrations_controller.rb

…

pictures_controller.rb

…

preferences_controller.rb

Change user settings to be stored in a more optimal way (#23630)

2023-03-30 14:44:00 +02:00

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentication_methods_controller.rb

…