luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 18:14:09 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api/v1/statuses
History
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
..
bookmarks_controller.rb
favourited_by_accounts_controller.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
favourites_controller.rb
mutes_controller.rb
pins_controller.rb
reblogged_by_accounts_controller.rb Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
reblogs_controller.rb Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +02:00