mastodon/app/controllers/api/v1
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
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-01-14 22:34:09 +01:00
admin Fix /api/v1/admin/trends/tags using wrong serializer (#18943) 2023-01-18 16:28:18 +01:00
announcements
apps
crypto
emails
featured_tags
instances
lists
polls
push
statuses
timelines Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
trends
accounts_controller.rb
announcements_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
featured_tags_controller.rb
filters_controller.rb Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988) 2022-12-07 00:10:53 +01:00
follow_requests_controller.rb
followed_tags_controller.rb Fix pagination of followed tags (#20861) 2022-11-17 10:54:10 +01:00
instances_controller.rb
lists_controller.rb Fix uncaught 500 error on invalid `replies_policy` (Fix #19097) (#20126) 2022-11-08 16:37:28 +01:00
markers_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
streaming_controller.rb Apply Rubocop Style/NegatedIfElseCondition (#23451) 2023-02-08 07:07:36 +01:00
suggestions_controller.rb
tags_controller.rb Fix not being able to follow more than one hashtag (#21285) 2022-11-21 10:35:09 +01:00