glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	04f2c25e5d	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.	4 years ago
Eugen Rochko	78ceda1af6	Refactor how public and tag timelines are queried (#14728 )	4 years ago

Author

SHA1

Message

Date

Thibaut Girka

04f2c25e5d

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.

Eugen Rochko

78ceda1af6

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

2 Commits (2c7280ac42a85fab7f56929970b77ee7249697da)