glitchier-soc/app
Claire d4f25d52dd Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change.
2022-04-08 19:53:32 +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-08 19:53:32 +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-08 19:53:32 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
mailers Fix failure when sending warning emails with custom text (#17983) 2022-04-07 14:47:30 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +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-08 19:53:32 +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-08 19:53:32 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00