tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api/v1/timelines
History
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
 		2020-08-30 16:13:08 +02:00
..
direct_controller.rb Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212) 2019-07-05 02:14:56 +02:00
home_controller.rb Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
list_controller.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
public_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
tag_controller.rb Introduce ApplicationController#cache_collection_paginated_by_id (#14677) 2020-08-28 12:31:56 +02:00