mastodon/spec
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
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
fabricators
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
policies
presenters
requests
routing
serializers/activitypub
services Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-03 14:54:30 +02:00
support
validators
views
workers
rails_helper.rb
spec_helper.rb