Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

exports

…

migration

…

preferences

…

two_factor_authentication

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

aliases_controller.rb

…

applications_controller.rb

…

base_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

deletes_controller.rb

…

exports_controller.rb

…

featured_tags_controller.rb

Add not_featured_by scope to Tag (#28815)

2024-04-17 10:05:38 +00:00

flavours_controller.rb

…

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

…

pictures_controller.rb

…

privacy_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentication_methods_controller.rb

…

verifications_controller.rb

…