tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-03-18 09:20:48 -04:00

History

Claire baac429103 Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3

Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
  In addition, upstream changed how notifications from follow subscriptions were
  handled, refactoring this file in the process.
  Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.

2025-02-25 18:33:54 +01:00

activitypub

Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream

2024-09-23 20:24:18 +02:00

node_info

nodeinfo: add instance name and description (#28079 )

2023-11-28 00:51:22 +00:00

rest

Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3

2025-02-25 18:33:54 +01:00

web

Update dependency rubocop-rails to v2.20.1 (#25493 )