glitchier-soc/spec/controllers/api/v1/accounts
Claire 92d1e05c3e 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
..
credentials_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
follower_accounts_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
following_accounts_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
lists_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
notes_controller_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
pins_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
relationships_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
search_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
statuses_controller_spec.rb Add tests to indicate inclusion of self replies in statuses endpoint (#23266) 2023-02-13 16:04:26 +01:00