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 '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-09-02 15:02:29 +02:00
parent 4371df7fbe 05093266e6
commit c107512fa6
40 changed files with 893 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/initial_state_serializer.rb
View File

@@ -8,6 +8,8 @@ class InitialStateSerializer < ActiveModel::Serializer
:max_toot_chars, :poll_limits,
:languages
attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
has_one :role, serializer: REST::RoleSerializer