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

Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.

2022-05-16 09:42:32 +02:00

..

exports

…

migration

…

preferences

…

two_factor_authentication

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

2021-08-27 11:29:03 +02:00

aliases_controller.rb

…

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

Fix user email address being banned on self-deletion (#16503)

2021-07-14 05:35:49 +02:00

exports_controller.rb

Refactor how Redis locks are created (#18400)

2022-05-13 00:02:35 +02:00

featured_tags_controller.rb

…

flavours_controller.rb

…

imports_controller.rb

…

login_activities_controller.rb

Fix login date not showing up in login history by using “public” pack

2021-06-23 12:21:40 +02:00

migrations_controller.rb

…

pictures_controller.rb

…

preferences_controller.rb

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

2022-04-08 19:53:32 +02:00

profiles_controller.rb

Add /api/v1/accounts/familiar_followers to REST API (#17700)

2022-03-07 09:36:47 +01:00

sessions_controller.rb

…

two_factor_authentication_methods_controller.rb

…