mastodon/app/controllers/api/v1
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
admin Add trend management to admin API (#24257) 2023-04-18 11:33:30 +02:00
announcements
apps
crypto
emails Enable Rubocop HTTP status rules (#23717) 2023-02-20 11:16:40 +09:00
featured_tags
instances Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662) 2023-04-26 11:42:47 +02:00
lists Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
polls
push
statuses Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
accounts_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
announcements_controller.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
apps_controller.rb
blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
bookmarks_controller.rb
conversations_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
custom_emojis_controller.rb Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665) 2023-04-28 10:01:38 +02:00
directories_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
domain_blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
endorsements_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
favourites_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
followed_tags_controller.rb
instances_controller.rb Fix some user-independent endpoints potentially reading session cookies (#24650) 2023-04-25 22:14:44 +02:00
lists_controller.rb
markers_controller.rb
media_controller.rb
mutes_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
notifications_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
polls_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
streaming_controller.rb Add allow_other_host in redirects which may go outside app (#24252) 2023-03-26 00:38:32 +01:00
suggestions_controller.rb
tags_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00