glitchier-soc/app
Claire 17e93dbce5 Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
..
chewy Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448) 2023-08-21 16:50:22 +02:00
controllers Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
helpers Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream 2023-08-22 18:31:28 +02:00
javascript Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
lib Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream 2023-08-24 21:26:27 +02:00
mailers Add List-Unsubscribe email header (#26085) 2023-08-01 19:34:40 +02:00
models Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
policies Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
presenters Add GET /api/v1/instance/languages to REST API (#24443) 2023-08-03 11:25:47 +02:00
serializers Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main 2023-08-13 18:47:15 +02:00
services Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream 2023-08-22 18:31:28 +02:00
validators Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
views Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream 2023-08-24 21:01:19 +02:00
workers Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00