Merge remote-tracking branch 'parent/main' into kb_migration

2023-09-03 10:55:46 +09:00 · 2023-09-03 10:55:46 +09:00 · 32cfd20257
commit 32cfd20257
parent 0e0e9e383b 728eb6a153
54 changed files with 1045 additions and 138 deletions
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -7,6 +7,8 @@ class InitialStateSerializer < ActiveModel::Serializer
             :media_attachments, :settings,
             :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