mastodon/spec/controllers
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
..
activitypub Add ActivityPub secure mode (#11269) 2019-07-11 20:11:09 +02:00
admin Fix remote and staff-removed statuses leaving media behind for a day (#11638) 2019-08-22 04:17:12 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
auth Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
concerns Change locale detection to run once per session (#8657) 2019-07-21 18:08:02 +02:00
oauth
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
well_known Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
application_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
authorize_interactions_controller_spec.rb
emojis_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
relationships_controller_spec.rb Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00
remote_follow_controller_spec.rb
remote_interaction_controller_spec.rb
shares_controller_spec.rb Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
statuses_controller_spec.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
tags_controller_spec.rb