catstodon/spec
Claire ce84d163cc Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
..
config/initializers Fix rate limiting for paths with formats (#20675) 2022-11-14 20:26:31 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
fabricators Add roles attribute to Account entities in REST API (#23255) 2023-01-25 19:55:40 +01:00
features Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
fixtures Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
helpers Use Rails tag API to build RSS feed for spoilers and polls (#20163) 2022-12-15 16:39:41 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
requests Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
routing Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
serializers Add tests for REST::AccountSerializer (#23319) 2023-02-13 13:23:59 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
support Validate nodeinfo response by schema (#21395) 2022-12-15 15:43:05 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note (#23318) 2023-02-07 01:14:44 +01:00
rails_helper.rb Apply Rubocop Style/ExpandPathArguments (#23450) 2023-02-08 07:06:20 +01:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00