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

Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.
This commit is contained in:
Claire
2024-04-06 21:01:40 +02:00
parent f635cde756 6c381f20b1
commit 1d1c3a808a
14 changed files with 88 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/serializers/initial_state_serializer.rb
View File

@@ -31,7 +31,6 @@ class InitialStateSerializer < ActiveModel::Serializer
if object.current_account
store[:me] = object.current_account.id.to_s
store[:unfollow_modal] = object_account_user.setting_unfollow_modal
store[:boost_modal] = object_account_user.setting_boost_modal
store[:favourite_modal] = object_account_user.setting_favourite_modal
store[:delete_modal] = object_account_user.setting_delete_modal