tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-12 18:52:52 -05:00

History

Claire cd1e3ac2c7 Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
  Upstream refactored this code, the conflict was because of an extra supported
  parameter, `allow_local_only`.
  Updated the controller to follow upstream's refactor, and moved the extra
  parameter definition accordingly.

2023-12-19 19:51:40 +01:00

chewy

Change link previews to keep original URL from the status (#27312 )

2023-11-13 09:58:28 +00:00

controllers

Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream

2023-12-19 19:51:40 +01:00

helpers

Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream

2023-12-18 19:10:43 +01:00

javascript

[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists