luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-20 05:44:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
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
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
v2 Move V2 Filter methods under /api/v2 prefix (#20622) 2022-11-14 08:34:07 +01:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
base_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
oembed_controller_spec.rb