luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 20:56:50 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
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
2019-06-24 15:02:59 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
v2
web
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
push_controller_spec.rb
salmon_controller_spec.rb
subscriptions_controller_spec.rb