Claire 73a625c284 Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.

2025-10-06 19:24:16 +02:00

..

base_controller.rb

Split timeline_preview setting into more granular settings (#36338)

2025-10-06 08:34:05 +00:00

direct_controller.rb

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

2024-05-16 19:30:10 +02:00

home_controller.rb

Split timeline_preview setting into more granular settings (#36338)

2025-10-06 08:34:05 +00:00

link_controller.rb

Split timeline_preview setting into more granular settings (#36338)

2025-10-06 08:34:05 +00:00

list_controller.rb

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00:00

public_controller.rb

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

2025-10-06 19:24:16 +02:00

tag_controller.rb

Split timeline_preview setting into more granular settings (#36338)

2025-10-06 08:34:05 +00:00

topic_controller.rb

Split timeline_preview setting into more granular settings (#36338)

2025-10-06 08:34:05 +00:00