glitchier-soc/app
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
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
mailers Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00