mastodon-glitch

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	9748f074a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.	2020-09-08 16:26:47 +02:00
Eugen Rochko	e8bc187845	Refactor how public and tag timelines are queried (#14728 )	2020-09-07 11:02:04 +02:00

Author

SHA1

Message

Date

Thibaut Girka

9748f074a3

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.

2020-09-08 16:26:47 +02:00

Eugen Rochko

e8bc187845

Refactor how public and tag timelines are queried (#14728 )

2020-09-07 11:02:04 +02:00

2 Commits (97da7b73071e9f515c4bb0bca72c88d1a13b14aa)