Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `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.
This commit is contained in:
Claire
2025-02-01 19:07:13 +01:00
parent 65caf6c085 f79b96a5ef
commit c85616ee3a
92 changed files with 767 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user_settings.rb
View File

@@ -34,6 +34,7 @@ class UserSettings
setting :delete_modal, default: true
setting :reblog_modal, default: false
setting :favourite_modal, default: false
setting :missing_alt_text_modal, default: true
setting :reduce_motion, default: false
setting :expand_content_warnings, default: false
setting :display_media, default: 'default', in: %w(default show_all hide_all)