]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 10 Feb 2022 18:09:27 +0000 (19:09 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 10 Feb 2022 18:09:27 +0000 (19:09 +0100)
commitf1a6f9062e00c0651680bf4d5d750ec0b078ac5a
tree30d40f0b5df56e955f80a91ae3b44090bd918ed9
parentd602c92b310545eb733a58caed49717341abe27c
parent3dc1e3cfc3928ce709c3e60e98ecbd1edd6e2a7d
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.
Gemfile
Gemfile.lock
app/controllers/api/v1/statuses_controller.rb
app/javascript/mastodon/actions/compose.js
app/javascript/mastodon/features/compose/components/compose_form.js
app/models/media_attachment.rb
app/models/status.rb
app/policies/status_policy.rb
config/routes.rb
spec/policies/status_policy_spec.rb
yarn.lock