mastodon/spec
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
fabricators
features
fixtures
helpers
lib
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views
workers
rails_helper.rb
spec_helper.rb