masto-fe/app
Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
2022-04-06 21:10:23 +02:00
..
chewy Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912) 2022-03-31 00:49:24 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-04-04 17:25:57 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
mailers Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 16:06:15 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 15:02:56 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00