You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/controllers/api
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
7 years ago
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
v2 Add more granular OAuth scopes (#7929) 8 years ago
web Lint pass (#8876) 8 years ago
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb Add Keybase integration (#10297) 7 years ago
push_controller_spec.rb
salmon_controller_spec.rb rubocop issues - Cleaning up (#8912) 8 years ago
subscriptions_controller_spec.rb rubocop issues - Cleaning up (#8912) 8 years ago